tree e1c4331ac8db1c28d3ea4c055353c783cf7f01ac
parent 27ee8963708185b96bc84a149eb5336a249a7497
parent 62af9b520513d78484f22f874916dfacbc889ce0
author Linus Torvalds <torvalds@linux-foundation.org> 1271781580 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1271781580 -0700

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