diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-12 17:27:53 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-12 17:27:53 +0100 |
| commit | f1c7404e37a8970bd58cc10a6d96534d42b9aac6 (patch) | |
| tree | c7d067f08f7ceca58f29526cb498c92e654ee400 /init | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | sunhme: Fix qfe parent detection. (diff) | |
| download | linux-f1c7404e37a8970bd58cc10a6d96534d42b9aac6.tar.xz linux-f1c7404e37a8970bd58cc10a6d96534d42b9aac6.zip | |
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
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions