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)
commitd20e6336ea4250e51081e4b2924b9ef4dfa45909
tree96c22694bec10912d40a3700a945157597dd901b
parentfa3c791d85aa9a363dd72dd834b73b79252ef44e
parent6dea93477c3377cf4199fd37cc3fb11071987ae4
Merge /pub/scm/linux/kernel/git/dtor/input
drivers/usb/input/hiddev.c