| commit | f1c7404e37a8970bd58cc10a6d96534d42b9aac6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 12 09:27:53 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 12 09:27:53 2009 -0700 |
| tree | c7d067f08f7ceca58f29526cb498c92e654ee400 | |
| parent | 8c57a8fa4e9226a44c4e98327852936df3b6791b [diff] | |
| parent | 0796e75503adc6b0a119493ce2e599fb5fd8f96e [diff] |
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