summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-06 00:40:31 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-06 00:40:31 (GMT)
commit47ad504c56235c7c7c0020e631651420a55c74e7 (patch)
treeedaa93e8ea3c7321b818a4e1c3c8ed44aaa651b9 /drivers/media
parent7b2a69ba7055da9a04eb96aa7b38c8e3280aaaa5 (diff)
parent7bfbeae9c78fb9404ccbd62a25c82f5860432ac9 (diff)
downloadlinux-fsl-qoriq-47ad504c56235c7c7c0020e631651420a55c74e7.tar.xz
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6: parisc: Fix GSC PS/2 driver name for keyboard and mouse parisc: KittyHawk LCD fix parisc: convert the rest of the irq handlers to simple/percpu parisc: fix dino/gsc interrupts parisc: remove redundant initialization in sigsegv path of sys_rt_sigreturn
Diffstat (limited to 'drivers/media')
0 files changed, 0 insertions, 0 deletions