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)
commiteadb448cbc6d88a414728cd369cbe96d670fb762
tree71d81eaa7bbaed03e8af9e106fa3d17018086dec
parent5eefec79f16006ff0d3fb91460e76df7f35455b9
parent80b228ce6c5ba2714f2e112a473218b5c2e7b2ee
Merge master.kernel.org:/home/davem/BK/sparc-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
arch/sparc64/kernel/ioctl32.c