Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 7 Sep 2013 03:23:44 +0000 (20:23 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 7 Sep 2013 03:23:44 +0000 (20:23 -0700)
commit07176b988ebb20f46a317a60ee1d983fe1630203
treee54affb1f823742078c68d9506e6035016bc2ea4
parentfa46c7984092f3dbdbb3bcd7338d81a1168d9d2b
parent52764fed5049655926bcecaefd52f0a415ceb105
Merge branch 'next' into for-linus

Merge first round of changes for 3.12 merge window.
drivers/input/tablet/wacom_wac.c
drivers/input/touchscreen/cyttsp4_core.c