Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
Linus Torvalds [Thu, 16 Feb 2006 04:00:48 +0000 (20:00 -0800)]

Trivial merge