Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs

Pull f2fs bug fixes from Jaegeuk Kim:
 "This patch-set includes two major bug fixes:
   - incorrect IUsed provided by *df -i*, and
   - lookup failure of parent inodes in corner cases.

  [Other Bug Fixes]
   - Fix error handling routines
   - Trigger recovery process correctly
   - Resolve build failures due to missing header files

  [Etc]
   - Add a MAINTAINERS entry for f2fs
   - Fix and clean up variables, functions, and equations
   - Avoid warnings during compilation"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs:
  f2fs: unify string length declarations and usage
  f2fs: clean up unused variables and return values
  f2fs: clean up the start_bidx_of_node function
  f2fs: remove unneeded variable from f2fs_sync_fs
  f2fs: fix fsync_inode list addition logic and avoid invalid access to memory
  f2fs: remove unneeded initialization of nr_dirty in dirty_seglist_info
  f2fs: handle error from f2fs_iget_nowait
  f2fs: fix equation of has_not_enough_free_secs()
  f2fs: add MAINTAINERS entry
  f2fs: return a default value for non-void function
  f2fs: invalidate the node page if allocation is failed
  f2fs: add missing #include <linux/prefetch.h>
  f2fs: do f2fs_balance_fs in front of dir operations
  f2fs: should recover orphan and fsync data
  f2fs: fix handling errors got by f2fs_write_inode
  f2fs: fix up f2fs_get_parent issue to retrieve correct parent inode number
  f2fs: fix wrong calculation on f_files in statfs
  f2fs: remove set_page_dirty for atomic f2fs_end_io_write

diff --combined MAINTAINERS
index fa309ab7ccbf5091339db4ec0765eef6a8670de9,599934c2403a46ac54e23cbed5c47193d926e5e7..7a58a25a6e7c0d518d3417e5e7168fa0a2e8e6b9
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3273,6 -3273,16 +3273,16 @@@ F:    Documentation/filesystems/caching
  F:    fs/fscache/
  F:    include/linux/fscache*.h
  
+ F2FS FILE SYSTEM
+ M:    Jaegeuk Kim <jaegeuk.kim@samsung.com>
+ L:    linux-f2fs-devel@lists.sourceforge.net
+ W:    http://en.wikipedia.org/wiki/F2FS
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
+ S:    Maintained
+ F:    Documentation/filesystems/f2fs.txt
+ F:    fs/f2fs/
+ F:    include/linux/f2fs_fs.h
+ 
  FUJITSU FR-V (FRV) PORT
  M:    David Howells <dhowells@redhat.com>
  S:    Maintained
@@@ -5385,15 -5395,6 +5395,15 @@@ F:    arch/arm/*omap*
  F:    drivers/i2c/busses/i2c-omap.c
  F:    include/linux/i2c-omap.h
  
 +OMAP DEVICE TREE SUPPORT
 +M:    Benoît Cousson <b-cousson@ti.com>
 +M:    Tony Lindgren <tony@atomide.com>
 +L:    linux-omap@vger.kernel.org
 +L:    devicetree-discuss@lists.ozlabs.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/boot/dts/*omap*
 +F:    arch/arm/boot/dts/*am3*
 +
  OMAP CLOCK FRAMEWORK SUPPORT
  M:    Paul Walmsley <paul@pwsan.com>
  L:    linux-omap@vger.kernel.org