Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Feb 2006 05:18:17 +0000 (21:18 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Feb 2006 05:18:17 +0000 (21:18 -0800)
1  2 
drivers/usb/input/hiddev.c

Simple merge