Merge branches 'roccat', 'upstream' and 'wiimote' into for-linus

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/hid/Makefile
Simple merge

diff --cc drivers/hid/hid-core.c
index c957c4b4fe703368a4d19e739277b5c9bd41383b,9657007e4927ca99f495a326c148e5e9fd383502,eccaf8ad26c149ddbded4a974f76670c0744af26..1a5cf0c9cfcade20b35386e183f36a69155f5a7a
--- 1/drivers/hid/hid-core.c
--- 2/drivers/hid/hid-core.c
--- 3/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@@ -1422,8 -1423,9 -1423,9 +1424,10 @@@@ static const struct hid_device_id hid_h
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACETRAVELLER) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACENAVIGATOR) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LUMIO, USB_DEVICE_ID_CRYSTALTOUCH) },
++      { HID_USB_DEVICE(USB_VENDOR_ID_LUMIO, USB_DEVICE_ID_CRYSTALTOUCH_DUAL) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD_BOOTLOADER) },
+ +     { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K) },

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/hid/hid-multitouch.c
Simple merge