| commit | 05ce7bfe547c9fa967d9cab6c37867a9cb6fb3fa | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 20 09:39:40 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 20 09:39:40 2010 -0700 |
| tree | e1c4331ac8db1c28d3ea4c055353c783cf7f01ac | |
| parent | 27ee8963708185b96bc84a149eb5336a249a7497 [diff] | |
| parent | 62af9b520513d78484f22f874916dfacbc889ce0 [diff] |
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