]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commita24517e8218a05283b758878ed6771203dea9337
treee88670cf3fba9d885b3d71c00fb9a7809ed3f9e2
parentc38bfa72476d66388a06057b5da12d6bf3b89a5d
parentf8aa06e36b5c1dae7ff8bd0a8f004bc2377ef96c
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