Merge branch 'for-linus' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/dtor...
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 24 Aug 2006 04:11:56 +0000 (21:11 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 24 Aug 2006 04:11:56 +0000 (21:11 -0700)
commitb7277155f8fa89cd5696140b4a93cfb53d0091ff
treec75cb996b2942d15e3a5d4327e9c582336880292
parentccc712fe6b2acbafe9fc31f765a193e3249ca4a1
parentc712a9de94a5df5bc0087c14ad0b1aac2c147991
Merge branch 'for-linus' of gregkh@/linux/kernel/git/dtor/input