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

diff --cc drivers/hid/Kconfig
index d68292a50df589531deff070fdb9528a5f2e56d2,c91d547191dd2b7a511b1564523c8f649ec6ac2d,aee718269ab3b4d4b7a72d6b396a49b1f075e11f,61ebd965be8c74adb0ea6e4bdc3af90fd35c49a1,c91d547191dd2b7a511b1564523c8f649ec6ac2d,48525de02a392fc26a1e302b5ac8cba89b784160,c91d547191dd2b7a511b1564523c8f649ec6ac2d..329fbb9b59766f82af6c744e4e85a6ee1dc88208
--- 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 e8353f331792fbf53928ae8e654fa31b74914781,e80da62363bc2c96d6be419f89d002f3a55e4d36,95d2dff0a7ee5c0bd1c90510681e31be50801cab,825f9c3aadb194d16a237b86216da233ce9a63d1,ec6ba50e7455ffb4f6d9eb03acb851713f60cf6d,4c2f3b4ffa308b31110d2a183970396f8e68307d,e80da62363bc2c96d6be419f89d002f3a55e4d36..8c10f2742233e2f731aa7b798f49b178cee93279
--- 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 bdebab4e345bb89725d385698be8789875c5abd6,f0296a50be5f754fc7be2b8f593bf2b2beca1e22,312d7fd20ee1fa6d4425e2b069aaef6b09ab0947,842685a77e4bcb80c8ac55b65031340f6ace32f9,768fafc42c8780f4c28f781aa685262acd57a6f5,e60e8d530697fcaf0a7c4a43f42e53b455de6f4d,f0296a50be5f754fc7be2b8f593bf2b2beca1e22..76559629568c44dc2fd5b38c072faf446c063b17
--- 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