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)
Conflicts:
drivers/input/Makefile


Trivial merge