tree ef1ce43c9ae6ea56d1a928f97e760a17604ba11d
parent 44e7ed396114a0c43bb2494877aceeb7782e084a
parent ddef43a843f620c6742a06633739887a901ec06b
author Linus Torvalds <torvalds@linux-foundation.org> 1220377501 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1220377501 -0700

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