Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Mar 2009 16:27:53 +0000 (09:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Mar 2009 16:27:53 +0000 (09:27 -0700)
commitf1c7404e37a8970bd58cc10a6d96534d42b9aac6
treec7d067f08f7ceca58f29526cb498c92e654ee400
parent8c57a8fa4e9226a44c4e98327852936df3b6791b
parent0796e75503adc6b0a119493ce2e599fb5fd8f96e
Merge git://git./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
drivers/net/sunhme.c