Merge branches 'for-3.11/battery', 'for-3.11/elo', 'for-3.11/holtek' and 'for-3.11...

diff --combined drivers/hid/Kconfig
index fb52f3f6de80a377112ea0af5dfb8153772cc14e,dd4fdb67c974f6c25b5815ac79ae3514180b04f7,79e02682b2dfb3b4334afde613486bdf798fe8d6,fb52f3f6de80a377112ea0af5dfb8153772cc14e..b93e299eb272ab6d5e446c9a4124510c770575c7
--- 1/drivers/hid/Kconfig
--- 2/drivers/hid/Kconfig
--- 3/drivers/hid/Kconfig
--- 4/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@@@ -217,6 -217,13 -217,6 -217,6 +217,13 @@@@@ config HID_ELECO
        ---help---
        Support for the ELECOM BM084 (bluetooth mouse).
    
+ ++config HID_ELO
+ ++    tristate "ELO USB 4000/4500 touchscreen"
+ ++    depends on USB_HID
+ ++    ---help---
+ ++    Support for the ELO USB 4000/4500 touchscreens. Note that this is for
+ ++    different devices than those handled by CONFIG_TOUCHSCREEN_USB_ELO.
+ ++
    config HID_EZKEY
        tristate "Ezkey BTC 8193 keyboard" if EXPERT
        depends on HID
@@@@@ -231,6 -238,6 -231,9 -231,6 +238,9 @@@@@ config HID_HOLTE
        Support for Holtek based devices:
          - Holtek On Line Grip based game controller
          - Trust GXT 18 Gaming Keyboard
++ +      - Sharkoon Drakonia / Perixx MX-2000 gaming mice
++ +      - Tracer Sniper TRM-503 / NOVA Gaming Slider X200 /
++ +        Zalman ZM-GM1
    
    config HOLTEK_FF
        bool "Holtek On Line Grip force feedback support"

diff --combined drivers/hid/Makefile
index 2065694f57abe482693371988781421404a2485e,d1841ce0a30bea4a1645b0fa02ed907cd11c6959,1fc048b04aaa8944adde354c9828c706a5d8b382,2065694f57abe482693371988781421404a2485e..7a0340ace1860747c087444a908a9f1d2243247a
--- 1/drivers/hid/Makefile
--- 2/drivers/hid/Makefile
--- 3/drivers/hid/Makefile
--- 4/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@@@@ -48,9 -48,10 -48,10 -48,9 +48,11 @@@@@ obj-$(CONFIG_HID_CYPRESS)  += hid-cypres
    obj-$(CONFIG_HID_DRAGONRISE)        += hid-dr.o
    obj-$(CONFIG_HID_EMS_FF)    += hid-emsff.o
    obj-$(CONFIG_HID_ELECOM)    += hid-elecom.o
+ ++obj-$(CONFIG_HID_ELO)               += hid-elo.o
    obj-$(CONFIG_HID_EZKEY)             += hid-ezkey.o
    obj-$(CONFIG_HID_GYRATION)  += hid-gyration.o
    obj-$(CONFIG_HID_HOLTEK)    += hid-holtek-kbd.o
++ +obj-$(CONFIG_HID_HOLTEK)    += hid-holtek-mouse.o
    obj-$(CONFIG_HID_HOLTEK)    += hid-holtekff.o
    obj-$(CONFIG_HID_HYPERV_MOUSE)      += hid-hyperv.o
    obj-$(CONFIG_HID_ICADE)             += hid-icade.o

diff --combined drivers/hid/hid-core.c
index 264f550999406f7b924be6634917e3826e80a161,b06bac2f04ed43e83a51c3c2c4e5f2d102086575,3c014488b3c8c1befd71dd2e15b32f413359b5cb,264f550999406f7b924be6634917e3826e80a161..b29c956c395c93c8ed35e5de4b64b3ed03de425a
--- 1/drivers/hid/hid-core.c
--- 2/drivers/hid/hid-core.c
--- 3/drivers/hid/hid-core.c
--- 4/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@@@ -1573,6 -1573,8 -1573,6 -1573,6 +1573,8 @@@@@ static const struct hid_device_id hid_h
        { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0011) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },
+ ++    { HID_USB_DEVICE(USB_VENDOR_ID_ELO, 0x0009) },
+ ++    { HID_USB_DEVICE(USB_VENDOR_ID_ELO, 0x0030) },
        { HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) },
        { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },
@@@@@ -1584,6 -1586,6 -1584,8 -1584,6 +1586,8 @@@@@
        { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) },
        { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK, USB_DEVICE_ID_HOLTEK_ON_LINE_GRIP) },
        { 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_JESS2, USB_DEVICE_ID_JESS2_COLOR_RUMBLE_PAD) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ION, USB_DEVICE_ID_ICADE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },