Merge master.kernel.org:/home/davem/BK/sparc-2.5
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Wed, 13 Mar 2002 07:22:17 +0000 (23:22 -0800)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Wed, 13 Mar 2002 07:22:17 +0000 (23:22 -0800)
commit44879cd071139ca0338756c4ba603376d768239a
tree8e4d1e9b27dfd79facf1dd3ee509cbd84beea4b2
parent12eb9056957b3142b3756e978f2863f6b539ba35
parent08c5a46ff75727e5b9279eebbe547185b3fd3777
Merge master.kernel.org:/home/davem/BK/sparc-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
arch/sparc64/kernel/ioctl32.c