Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 7 Nov 2005 18:30:33 +0000 (10:30 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 7 Nov 2005 18:30:33 +0000 (10:30 -0800)

Trivial merge