Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
commite7de369050534025b33aab1033358bf47a577e4d
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 14 Jan 2006 17:49:16 +0000 (14 09:49 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 14 Jan 2006 17:49:16 +0000 (14 09:49 -0800)
treefed44f469923690b98f9de2c87e6d1de76f71dc9
parent87530db5ec7d519c7ba334e414307c5130ae2da8
parenteab9edd27f7ceaad6b57085817d63287bda15190
Merge /pub/scm/linux/kernel/git/dtor/input