Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDmitry Torokhov <dtor_core@ameritech.net>
Mon, 26 Jun 2006 05:31:38 +0000 (01:31 -0400)
committerDmitry Torokhov <dtor_core@ameritech.net>
Mon, 26 Jun 2006 05:31:38 +0000 (01:31 -0400)
1  2 
drivers/char/keyboard.c

Simple merge