Merge remote-tracking branch 'input/next'

diff --cc arch/sh/boards/mach-ecovec24/setup.c
Simple merge

diff --cc drivers/input/keyboard/adp5588-keys.c
Simple merge

diff --cc drivers/input/keyboard/adp5589-keys.c
Simple merge

diff --cc drivers/input/keyboard/bf54x-keys.c
Simple merge

diff --cc drivers/input/misc/adxl34x.c
Simple merge

diff --cc drivers/input/tablet/wacom_sys.c
Simple merge

diff --cc drivers/input/tablet/wacom_wac.c
index 782c2535f1d81a26db96716ac406405b2b03a78b,eb60a284be057af5b17a3143846d9c588e92f6f9..7655088f78e0efc4bab45fa62cfc442230b460c1
--- 1/drivers/input/tablet/wacom_wac.c
--- 2/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@@ -2333,10 -2355,11 +2361,13 @@@ const struct usb_device_id wacom_ids[] 
        { USB_DEVICE_WACOM(0x100) },
        { USB_DEVICE_WACOM(0x101) },
        { USB_DEVICE_WACOM(0x10D) },
 +      { USB_DEVICE_WACOM(0x10E) },
 +      { USB_DEVICE_WACOM(0x10F) },
        { USB_DEVICE_WACOM(0x300) },
        { USB_DEVICE_WACOM(0x301) },
+       { USB_DEVICE_DETAILED(0x302, USB_CLASS_HID, 0, 0) },
+       { USB_DEVICE_DETAILED(0x303, USB_CLASS_HID, 0, 0) },
+       { USB_DEVICE_DETAILED(0x30E, USB_CLASS_HID, 0, 0) },
        { USB_DEVICE_WACOM(0x304) },
        { USB_DEVICE_DETAILED(0x314, USB_CLASS_HID, 0, 0) },
        { USB_DEVICE_DETAILED(0x315, USB_CLASS_HID, 0, 0) },

diff --cc drivers/input/touchscreen/cyttsp_core.c
Simple merge