projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c57a8f 0796e75)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <[email protected]>
Thu, 12 Mar 2009 16:27:53 +0000 (09:27 -0700)
committerLinus Torvalds <[email protected]>
Thu, 12 Mar 2009 16:27:53 +0000 (09:27 -0700)
* 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

1  2 
drivers/net/sunhme.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/sunhme.c
Simple merge
John Crispins staging tree