]> git.hungrycats.org Git - linux/commitdiff
Merge master.kernel.org:/home/davem/BK/sparc-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Thu, 14 Mar 2002 11:51:58 +0000 (03:51 -0800)
committerLinus Torvalds <torvalds@home.transmeta.com>
Thu, 14 Mar 2002 11:51:58 +0000 (03:51 -0800)
into home.transmeta.com:/home/torvalds/v2.5/linux

1  2 
arch/sparc64/kernel/ioctl32.c

Simple merge