Merge branch 'next' into for-linus

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

diff --cc drivers/input/mouse/sentelic.c
Simple merge

diff --cc drivers/input/mouse/synaptics.c
Simple merge

diff --cc drivers/input/tablet/wacom_wac.c
index 2ee47d01a3b4ecde112b07ac95ccd798f053e4f4,a22e7789d91bc05962866c4f94cc7b9972403d8c..88672ec296c116e10d7340c7f07397e10e09afe1
--- 1/drivers/input/tablet/wacom_wac.c
--- 2/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@@ -1614,8 -1775,8 +1778,9 @@@ const struct usb_device_id wacom_ids[] 
        { USB_DEVICE_WACOM(0xE2) },
        { USB_DEVICE_WACOM(0xE3) },
        { USB_DEVICE_WACOM(0xE6) },
 +      { USB_DEVICE_WACOM(0xEC) },
        { USB_DEVICE_WACOM(0x47) },
+       { USB_DEVICE_WACOM(0xF4) },
        { USB_DEVICE_LENOVO(0x6004) },
        { }
  };