summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-08 18:54:49 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-08 18:54:49 (GMT)
commit764e028e24d33f6e375d2a5df450c9d0180fbc00 (patch)
tree94c5c4a8f0b26a2d23af5f0340023533fa620010 /drivers/video
parent934648f0449fae00946f55d64cd998bb5587fa1f (diff)
parent557a3dac2c1436054a8d4493d0ee835dd034c8f7 (diff)
downloadlinux-fsl-qoriq-764e028e24d33f6e375d2a5df450c9d0180fbc00.tar.xz
Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6
* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6: Staging: ath6kl: remove empty files that mess with 'distclean' staging: ath6kl: Fixing the driver to use modified mmc_host structure Staging: solo6x10: fix build problem
Diffstat (limited to 'drivers/video')
0 files changed, 0 insertions, 0 deletions