Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Sep 2008 15:42:55 +0000 (08:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Sep 2008 15:42:55 +0000 (08:42 -0700)
commit6d242a263618ba7f0f9a41dd91b347d19e704bbe
tree1c532ca96d543bd2335a5915d9c7646ffe776eba
parenta0a4a2cb0d69446c084792a40884d911dfc3cf27
parent2dc75d3c3b49c64fd26b4832a7efb75546cb3fc5
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: disable sysfs parts of the disk command filter