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)
Merge first round of changes for 3.12 merge window.

1  2 
drivers/input/tablet/wacom_wac.c
drivers/input/touchscreen/cyttsp4_core.c

Simple merge