Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Dec 2010 00:40:31 +0000 (16:40 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Dec 2010 00:40:31 +0000 (16:40 -0800)
commit47ad504c56235c7c7c0020e631651420a55c74e7
treeedaa93e8ea3c7321b818a4e1c3c8ed44aaa651b9
parent7b2a69ba7055da9a04eb96aa7b38c8e3280aaaa5
parent7bfbeae9c78fb9404ccbd62a25c82f5860432ac9
Merge branch 'fixes' of git://git./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