Merge penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/joystick
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Tue, 26 Feb 2002 05:27:08 +0000 (21:27 -0800)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Tue, 26 Feb 2002 05:27:08 +0000 (21:27 -0800)
commit31079ce2c086dd913350963c6956c0812b368dbf
tree80a25f24477324997f19237bfd7e688f533de30c
parent89c707631952161240493f880705dc5e26563ce4
parentc20c33755950a4d2ebe0f725e3b969a1d9716d9a
Merge penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/joystick
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
drivers/input/gameport/cs461x.c
drivers/input/gameport/emu10k1-gp.c