Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input...
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 16 Dec 2010 17:17:48 +0000 (09:17 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 16 Dec 2010 17:17:48 +0000 (09:17 -0800)
commit67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb
treec076d2f0b5d4ae8726a50206042d3e3a41620fe4
parent56a8bd6dcf81693e61a712097216904f3a4ab536
parent69479f8da68f1930b2078b2ebf6533fb00339918
Merge branch 'next' of git://git./linux/kernel/git/rydberg/input-mt into next

Conflicts:
drivers/input/Makefile
drivers/input/Makefile
drivers/input/input.c
include/linux/input.h