tree 1c532ca96d543bd2335a5915d9c7646ffe776eba
parent a0a4a2cb0d69446c084792a40884d911dfc3cf27
parent 2dc75d3c3b49c64fd26b4832a7efb75546cb3fc5
author Linus Torvalds <torvalds@linux-foundation.org> 1221147775 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1221147775 -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: disable sysfs parts of the disk command filter