Merge branch 'cando' into for-linus

Conflicts:
	drivers/hid/hid-core.c
	drivers/hid/hid-ids.h

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/hid/Makefile
Simple merge

diff --cc drivers/hid/hid-core.c
index 33cac4890ca4579589e220540289e0a815810662,262ab1048b60a1d27b33287e32914aadacd184d8..2dea86f5aff42b4662671f5ba356942dafeac24a
--- 1/drivers/hid/hid-core.c
--- 2/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@ -1281,9 -1295,9 +1281,11 @@@ static const struct hid_device_id hid_b
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
        { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },

diff --cc drivers/hid/hid-ids.h
index d55b81d2d16ef61a9819f4fddfe556bcf2ee9b83,968f59bb2e9538996d22a17618c8cb33ce0c5973..7f4b94fbd7ceb6e654f4202ebb30cf4530b5b3a3
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -124,9 -123,10 +124,13 @@@
  #define USB_VENDOR_ID_BERKSHIRE               0x0c98
  #define USB_DEVICE_ID_BERKSHIRE_PCWD  0x1140
  
 +#define USB_VENDOR_ID_BTC             0x046e
 +#define USB_DEVICE_ID_BTC_EMPREX_REMOTE       0x5578
 +
+ #define USB_VENDOR_ID_CANDO           0x2087
+ #define USB_DEVICE_ID_CANDO_MULTI_TOUCH 0x0a01
+ #define USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6 0x0b03
+ 
  #define USB_VENDOR_ID_CH              0x068e
  #define USB_DEVICE_ID_CH_PRO_PEDALS   0x00f2
  #define USB_DEVICE_ID_CH_COMBATSTICK  0x00f4