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)
commit4854c7b27f0975a2b629f35ea3996d2968eb7c4f
tree4102bdb70289764a2058aff0f907b13d7cf0e0d1
parent3cbd5b32cb625f5c0f1b1476d154fac873dd49ce
parentfcc18e83e1f6fd9fa6b333735bf0fcd530655511
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
drivers/char/keyboard.c