]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 62620d9 e4964fb)
Merge master.kernel.org:/home/davem/BK/sparc-2.5
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Tue, 12 Mar 2002 05:16:14 +0000 (21:16 -0800)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Tue, 12 Mar 2002 05:16:14 +0000 (21:16 -0800)
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

1  2 
arch/sparc64/defconfig patch | diff1 | diff2 | blob | history
arch/sparc64/kernel/ioctl32.c patch | diff1 | diff2 | blob | history

diff --cc arch/sparc64/defconfig
Simple merge
diff --cc arch/sparc64/kernel/ioctl32.c
Simple merge
Linux kernels and configurations used by Zygo.