diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-02 17:45:01 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-02 17:45:01 (GMT) |
commit | 1586553bc840e17c321f244fc264ea8312678faf (patch) | |
tree | ef1ce43c9ae6ea56d1a928f97e760a17604ba11d /fs/cifs/README | |
parent | 44e7ed396114a0c43bb2494877aceeb7782e084a (diff) | |
parent | ddef43a843f620c6742a06633739887a901ec06b (diff) | |
download | linux-1586553bc840e17c321f244fc264ea8312678faf.tar.xz |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
block: restore original behavior of /proc/partition when there's no partition
remove blk_register_filter and blk_unregister_filter in gendisk
Diffstat (limited to 'fs/cifs/README')
0 files changed, 0 insertions, 0 deletions