From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Mar 2009 16:27:53 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=f1c7404e37a8970bd58cc10a6d96534d42b9aac6;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sunhme: Fix qfe parent detection.
  sparc64: Fix lost interrupts on sun4u.
  sparc64: wait_event_interruptible_timeout may return -ERESTARTSYS
  jsflash: stop defining MAJOR_NR
---

f1c7404e37a8970bd58cc10a6d96534d42b9aac6