Merge branch 'upstream-fixes' into for-linus

Conflicts:
	drivers/hid/hid-ids.h

diff --cc drivers/hid/Kconfig
Simple merge

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

diff --cc drivers/hid/hid-ids.h
index 7f0e40bdb47ea16f5de8bb98c879f1fdecdaab99,be5a8929dd0ca6c94baaca0b878bbebabbd929cb..066d219b7f1031a384c358dee8b1c7e154164ac9
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -479,14 -472,17 +479,17 @@@
  
  #define USB_VENDOR_ID_THRUSTMASTER    0x044f
  
- #define USB_VENDOR_ID_TOPMAX          0x0663
- #define USB_DEVICE_ID_TOPMAX_COBRAPAD 0x0103
- 
 +#define USB_VENDOR_ID_TOPSEED         0x0766
 +#define USB_DEVICE_ID_TOPSEED_CYBERLINK       0x0204
 +
+ #define USB_VENDOR_ID_TOPSEED2                0x1784
+ #define USB_DEVICE_ID_TOPSEED2_RF_COMBO       0x0004
+ 
 -#define USB_VENDOR_ID_TOUCHPACK               0x1bfd
 -#define USB_DEVICE_ID_TOUCHPACK_RTS   0x1688
 -
+ #define USB_VENDOR_ID_TOPMAX          0x0663
+ #define USB_DEVICE_ID_TOPMAX_COBRAPAD 0x0103
+ 
 -#define USB_VENDOR_ID_TOPSEED         0x0766
 -#define USB_DEVICE_ID_TOPSEED_CYBERLINK       0x0204
 +#define USB_VENDOR_ID_TOUCHPACK               0x1bfd
 +#define USB_DEVICE_ID_TOUCHPACK_RTS   0x1688
  
  #define USB_VENDOR_ID_TURBOX          0x062a
  #define USB_DEVICE_ID_TURBOX_KEYBOARD 0x0201