Merge branch 'for-next' of git://github.com/rydberg/linux into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 1 Oct 2012 21:40:51 +0000 (14:40 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 1 Oct 2012 21:40:51 +0000 (14:40 -0700)
commit7774036808011ceecc88cef01dfafcce39ed9fc5
treee88670cf3fba9d885b3d71c00fb9a7809ed3f9e2
parentfb4f552e895cec29934d94a99cbd1f1f00448a88
parent51c80b74002f86477d691ed7c8ac479dcfa6271c
Merge branch 'for-next' of git://github.com/rydberg/linux into next

Merge Henrik's updates to multitouch code. Even though Jiri already
pulled them in I need to do it too since my changes to evdev using
dynamic major would clash with them.
drivers/input/input.c
drivers/input/misc/uinput.c
drivers/input/tablet/wacom_wac.c