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)
commit3c241f8337542655ee013a661b7f1770f561d3ef
tree79dd9a5dd12d305e1be7b926d414855377d2e192
parentdbf4ccd6043e58ed32fbf253fb3f0a9991e4c13a
parenteae936e21bd726f9d9555f2262d439fbcd61dccf
Merge ... /linux/kernel/git/torvalds/linux-2.6
drivers/usb/input/hid-core.c