]> git.hungrycats.org Git - linux/commitdiff
Merge bk://linux-input.bkbits.net/linux-input
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Thu, 1 Aug 2002 06:03:13 +0000 (23:03 -0700)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Thu, 1 Aug 2002 06:03:13 +0000 (23:03 -0700)
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

1  2 
drivers/input/input.c

Simple merge