diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-11 18:55:48 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-11 18:55:48 +0200 |
commit | 854a989546c12683186c84601d4902591dddd8a9 (patch) | |
tree | 143362c88a48958bdf68396379c4401f6caa82ae /drivers/net/smc-ultra32.c | |
parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | sparc: Fix debugger syscall restart interactions. (diff) | |
download | linux-854a989546c12683186c84601d4902591dddd8a9.tar.xz linux-854a989546c12683186c84601d4902591dddd8a9.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:
sparc: Fix debugger syscall restart interactions.
sparc: Fix ptrace() detach.
sparc32: Don't twiddle PT_DTRACE in exec.
sparc video: remove open boot prom code
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions