Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorGreg Kroah-Hartman <gregkh@suse.de>
Sat, 5 Aug 2006 17:49:00 +0000 (10:49 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sat, 5 Aug 2006 17:49:00 +0000 (10:49 -0700)

Trivial merge