summaryrefslogtreecommitdiffstats
path: root/drivers/net/smc-ultra32.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-11 18:55:48 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-11 18:55:48 +0200
commit854a989546c12683186c84601d4902591dddd8a9 (patch)
tree143362c88a48958bdf68396379c4401f6caa82ae /drivers/net/smc-ultra32.c
parentMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentsparc: Fix debugger syscall restart interactions. (diff)
downloadlinux-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