Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Jan 2006 16:30:29 +0000 (08:30 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Jan 2006 16:30:29 +0000 (08:30 -0800)

Trivial merge