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
This commit is contained in:
Linus Torvalds 2008-09-02 10:45:01 -07:00
commit 1586553bc8
5 changed files with 20 additions and 4 deletions