Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 12 Aug 2013 22:00:40 +0000 (15:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 12 Aug 2013 22:00:40 +0000 (15:00 -0700)
commitfd4f35d0facb8b7d028b6abc827364f071132c12
treebb9cd364feb6d8d32ef7ceaa384023d0f567fe24
parent278225588d9989437e02b1020661f440b4df1709
parentcde2d7a796f7e895e25b43471ed658079345636d
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