Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Apr 2010 16:39:40 +0000 (09:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Apr 2010 16:39:40 +0000 (09:39 -0700)
commit05ce7bfe547c9fa967d9cab6c37867a9cb6fb3fa
treee1c4331ac8db1c28d3ea4c055353c783cf7f01ac
parent27ee8963708185b96bc84a149eb5336a249a7497
parent62af9b520513d78484f22f874916dfacbc889ce0
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