Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Oct 2015 20:31:00 +0000 (13:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Oct 2015 20:31:00 +0000 (13:31 -0700)
commitc7823b6b97ddc3d9f627611557d2b5842c36b67e
tree12e2328e64f37847c35ab3552f795413f1ebd0e5
parent176bed1de5bf977938cad26551969eca8f0883b1
parentd4eb6dee471250661a5183a7336b18c85990e26d
Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-fs

Pull ext4 Kconfig description fixup from Jan Kara:
 "A small fixup in description of EXT4_USE_FOR_EXT2 config option"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  ext4: Update EXT4_USE_FOR_EXT2 description