Merge branch 'wacom' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 7 Aug 2014 06:31:48 +0000 (23:31 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 7 Aug 2014 06:31:48 +0000 (23:31 -0700)
commitfc8104bc5a3f6f49d79f45f2706f79f77a9fb2ae
treec30f3c27cb719f1e268f485640cfab9898557676
parent62238f3aadc9bc56da70100e19ec61b9f8d72a5f
parentf2e0a7d4a0b94b4274e3b7e15bf650d45a866f3c
Merge branch 'wacom' into next

Merge large update to Wacom driver, converting it from USB to a HID
driver and unifying wired and bluetooth support, from Benjamin
Tissoires.
drivers/input/tablet/Kconfig
drivers/input/tablet/Makefile