]> git.neil.brown.name Git - history.git/commitdiff
Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin
authorPatrick Mochel <mochel@osdl.org>
Mon, 26 Aug 2002 10:49:41 +0000 (03:49 -0700)
committerPatrick Mochel <mochel@osdl.org>
Mon, 26 Aug 2002 10:49:41 +0000 (03:49 -0700)
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-input

1  2 
drivers/char/keyboard.c

Simple merge