From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 6 Dec 2010 00:40:31 +0000 (-0800)
Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
X-Git-Tag: v2.6.37-rc5~7
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=47ad504c56235c7c7c0020e631651420a55c74e7;p=~emulex%2Finfiniband.git

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
---

47ad504c56235c7c7c0020e631651420a55c74e7