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

Conflicts:
	drivers/hid/hid-logitech-hidpp.c

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

diff --cc drivers/hid/hid-logitech-hidpp.c
index 5fd530acf747c50fcd5bfbd51d19d3271e5d716b,394a6f41af0909780136a4d1dcb1b0c37062b5c7..7a5fb1ae73594bf8173f70be60207fd9e775b820
--- 1/drivers/hid/hid-logitech-hidpp.c
--- 2/drivers/hid/hid-logitech-hidpp.c
+++ b/drivers/hid/hid-logitech-hidpp.c
@@@ -40,10 -40,12 +40,11 @@@ MODULE_PARM_DESC(disable_raw_mode
  #define HIDPP_REPORT_LONG_LENGTH              20
  
  #define HIDPP_QUIRK_CLASS_WTP                 BIT(0)
+ #define HIDPP_QUIRK_CLASS_M560                        BIT(1)
  
- /* bits 1..20 are reserved for classes */
+ /* bits 2..20 are reserved for classes */
  #define HIDPP_QUIRK_DELAYED_INIT              BIT(21)
  #define HIDPP_QUIRK_WTP_PHYSICAL_BUTTONS      BIT(22)
 -#define HIDPP_QUIRK_MULTI_INPUT                       BIT(23)
  
  /*
   * There are two hidpp protocols in use, the first version hidpp10 is known