From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 Sep 2008 17:45:01 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: v2.6.27-rc6~90
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1586553bc840e17c321f244fc264ea8312678faf;p=linux-2.6-omap-h63xx.git

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
---

1586553bc840e17c321f244fc264ea8312678faf