Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Sep 2008 17:45:01 +0000 (10:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Sep 2008 17:45:01 +0000 (10:45 -0700)
commit1586553bc840e17c321f244fc264ea8312678faf
treeef1ce43c9ae6ea56d1a928f97e760a17604ba11d
parent44e7ed396114a0c43bb2494877aceeb7782e084a
parentddef43a843f620c6742a06633739887a901ec06b
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