summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-11 08:42:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-11 08:42:55 -0700
commit6d242a263618ba7f0f9a41dd91b347d19e704bbe (patch)
tree1c532ca96d543bd2335a5915d9c7646ffe776eba /drivers/media
parenta0a4a2cb0d69446c084792a40884d911dfc3cf27 (diff)
parent2dc75d3c3b49c64fd26b4832a7efb75546cb3fc5 (diff)
downloadlinux-6d242a263618ba7f0f9a41dd91b347d19e704bbe.tar.gz
linux-6d242a263618ba7f0f9a41dd91b347d19e704bbe.tar.bz2
linux-6d242a263618ba7f0f9a41dd91b347d19e704bbe.zip
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
Diffstat (limited to 'drivers/media')
0 files changed, 0 insertions, 0 deletions