Merge branches 'for-3.12/upstream-fixes', 'for-3.13/holtek', 'for-3.13/i2c-hid',...

diff --cc drivers/hid/Kconfig
index d68292a,c91d547,aee7182,61ebd96,c91d547,48525de,c91d547..329fbb9
--- 1/drivers/hid/Kconfig
--- 2/drivers/hid/Kconfig
--- 3/drivers/hid/Kconfig
--- 4/drivers/hid/Kconfig
--- 5/drivers/hid/Kconfig
--- 6/drivers/hid/Kconfig
--- 7/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@@@@@@ -241,8 -241,7 -241,7 -241,6 -241,7 -241,6 -241,7 +241,8 @@@@@@@@ config HID_HOLTE
          - Sharkoon Drakonia / Perixx MX-2000 gaming mice
          - Tracer Sniper TRM-503 / NOVA Gaming Slider X200 /
            Zalman ZM-GM1
   + +    - SHARKOON DarkGlider Gaming mouse
 ++++++   - LEETGION Hellion Gaming Mouse
       
       config HOLTEK_FF
        bool "Holtek On Line Grip force feedback support"

diff --cc drivers/hid/hid-core.c
index e8353f3,e80da62,95d2dff,825f9c3,ec6ba50,4c2f3b4,e80da62..8c10f27
--- 1/drivers/hid/hid-core.c
--- 2/drivers/hid/hid-core.c
--- 3/drivers/hid/hid-core.c
--- 4/drivers/hid/hid-core.c
--- 5/drivers/hid/hid-core.c
--- 6/drivers/hid/hid-core.c
--- 7/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@@@@@@ -1716,8 -1716,7 -1715,7 -1715,6 -1716,7 -1714,6 -1716,7 +1715,8 @@@@@@@@ static const struct hid_device_id hid_h
        { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD) },
        { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A) },
        { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067) },
 ++++++ { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A072) },
   + +  { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081) },
        { HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_580) },
        { HID_USB_DEVICE(USB_VENDOR_ID_JESS2, USB_DEVICE_ID_JESS2_COLOR_RUMBLE_PAD) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ION, USB_DEVICE_ID_ICADE) },

diff --cc drivers/hid/hid-ids.h
index bdebab4,f0296a5,312d7fd,842685a,768fafc,e60e8d5,f0296a5..7655962
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
--- 3/drivers/hid/hid-ids.h
--- 4/drivers/hid/hid-ids.h
--- 5/drivers/hid/hid-ids.h
--- 6/drivers/hid/hid-ids.h
--- 7/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@@@@@@ -448,10 -448,9 -448,9 -453,8 -448,9 -448,8 -448,9 +453,10 @@@@@@@@
       
       #define USB_VENDOR_ID_HOLTEK_ALT         0x04d9
       #define USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD        0xa055
 ------#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067      0xa067
       #define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A      0xa04a
 ++++++#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067      0xa067
 ++++++#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A072      0xa072
   + + #define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081      0xa081
       
       #define USB_VENDOR_ID_IMATION            0x0718
       #define USB_DEVICE_ID_DISC_STAKKA        0xd000

diff --cc drivers/hid/usbhid/hid-quirks.c
Simple merge