Merge branch 'for-4.2/upstream' into for-next

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

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

diff --cc drivers/hid/hid-logitech-hidpp.c
index 7a5fb1ae73594bf8173f70be60207fd9e775b820,b3cf6fd4be96473ba62ebbbf92d1522c024a509e..484196459305577c19433fe4fe35b21c2ac39905
--- 1/drivers/hid/hid-logitech-hidpp.c
--- 2/drivers/hid/hid-logitech-hidpp.c
+++ b/drivers/hid/hid-logitech-hidpp.c
@@@ -1498,15 -1296,11 +1498,10 @@@ static const struct hid_device_id hidpp
          HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH,
                USB_DEVICE_ID_LOGITECH_T651),
          .driver_data = HIDPP_QUIRK_CLASS_WTP },
--      { /* Keyboard TK820 */
-         HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_DJ_DEVICE,
-               USB_VENDOR_ID_LOGITECH, 0x4102),
-         .driver_data = HIDPP_QUIRK_DELAYED_INIT | HIDPP_QUIRK_MULTI_INPUT |
-                        HIDPP_QUIRK_CLASS_WTP },
 +      { /* Mouse logitech M560 */
          HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_DJ_DEVICE,
 -              USB_VENDOR_ID_LOGITECH, 0x4102),
 -        .driver_data = HIDPP_QUIRK_DELAYED_INIT | HIDPP_QUIRK_MULTI_INPUT |
 -                       HIDPP_QUIRK_CLASS_WTP },
 +              USB_VENDOR_ID_LOGITECH, 0x402d),
 +        .driver_data = HIDPP_QUIRK_DELAYED_INIT | HIDPP_QUIRK_CLASS_M560 },
  
        { HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_DJ_DEVICE,
                USB_VENDOR_ID_LOGITECH, HID_ANY_ID)},