Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 7 Aug 2014 06:36:12 +0000 (23:36 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 7 Aug 2014 06:36:12 +0000 (23:36 -0700)
commit5e2aa2ed08e2e280121dc7cf5609c87d464f12ef
treeca7d7b1480285e3b617fecc5b41f0ce150a82c32
parentf62d14a8072b9756db36ba394e2b267470a40240
parentfc8104bc5a3f6f49d79f45f2706f79f77a9fb2ae
Merge branch 'next' into for-linus

Prepare first round of input updates for 3.17.
drivers/hid/wacom_wac.c