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)
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.

1  2 
drivers/input/input.c
drivers/input/misc/uinput.c
drivers/input/tablet/wacom_wac.c

Simple merge
Simple merge
Simple merge