From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 Aug 2013 22:00:40 +0000 (-0700)
Subject: Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso... 
X-Git-Tag: v3.11-rc6~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd4f35d0facb8b7d028b6abc827364f071132c12;p=platform%2Fkernel%2Flinux-stable.git

Merge tag 'ext4_for_linus' of git://git./linux/kernel/git/tytso/ext4

Pull more ext4 bugfixes from Ted Ts'o:
 "A number of miscellaneous ext4 bugs fixes for v3.11, including a fix
  so that if ext4 is built as a module, to allow it to be unloaded"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: flush the extent status cache during EXT4_IOC_SWAP_BOOT
  ext4: fix mount/remount error messages for incompatible mount options
  ext4: allow the mount options nodelalloc and data=journal
---

fd4f35d0facb8b7d028b6abc827364f071132c12