]> err.no Git - linux-2.6/commitdiff
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDmitry Torokhov <dtor_core@ameritech.net>
Mon, 6 Jun 2005 07:21:03 +0000 (02:21 -0500)
committerDmitry Torokhov <dtor_core@ameritech.net>
Mon, 6 Jun 2005 07:21:03 +0000 (02:21 -0500)
1  2 
drivers/usb/input/hid-core.c

Simple merge