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.

diff --cc drivers/input/input.c
Simple merge

diff --cc drivers/input/misc/uinput.c
Simple merge

diff --cc drivers/input/tablet/wacom_wac.c
Simple merge