Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 29 Jul 2005 16:48:34 +0000 (09:48 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 29 Jul 2005 16:48:34 +0000 (09:48 -0700)
1  2 
drivers/usb/input/hid-core.c

Simple merge