diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-20 18:39:40 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-20 18:39:40 +0200 |
commit | 05ce7bfe547c9fa967d9cab6c37867a9cb6fb3fa (patch) | |
tree | e1c4331ac8db1c28d3ea4c055353c783cf7f01ac /block/blk-timeout.c | |
parent | Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/... (diff) | |
parent | quota: Convert __DQUOT_PARANOIA symbol to standard config option (diff) | |
download | linux-05ce7bfe547c9fa967d9cab6c37867a9cb6fb3fa.tar.xz linux-05ce7bfe547c9fa967d9cab6c37867a9cb6fb3fa.zip |
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
Diffstat (limited to 'block/blk-timeout.c')
0 files changed, 0 insertions, 0 deletions