Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 7 Jan 2006 19:29:51 +0000 (11:29 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 7 Jan 2006 19:29:51 +0000 (11:29 -0800)
1  2 
drivers/input/evdev.c

Simple merge