From: Linus Torvalds Date: Tue, 20 Apr 2010 16:39:40 +0000 (-0700) Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux... X-Git-Tag: v2.6.34-rc6~81 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=05ce7bfe547c9fa967d9cab6c37867a9cb6fb3fa;p=linux-2.6-block.git Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-fs-2.6 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: quota: Convert __DQUOT_PARANOIA symbol to standard config option --- 05ce7bfe547c9fa967d9cab6c37867a9cb6fb3fa