From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 15 Oct 2015 20:31:00 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
X-Git-Tag: Ubuntu-5.0.0-8.9~8531
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c7823b6b97ddc3d9f627611557d2b5842c36b67e;p=mirror_ubuntu-disco-kernel.git

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/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
---

c7823b6b97ddc3d9f627611557d2b5842c36b67e