commit | 47ad504c56235c7c7c0020e631651420a55c74e7 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Dec 05 16:40:31 2010 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Dec 05 16:40:31 2010 -0800 |
tree | edaa93e8ea3c7321b818a4e1c3c8ed44aaa651b9 | |
parent | 7b2a69ba7055da9a04eb96aa7b38c8e3280aaaa5 [diff] | |
parent | 7bfbeae9c78fb9404ccbd62a25c82f5860432ac9 [diff] |
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