Merge branches '3m', 'egalax', 'logitech', 'magicmouse', 'ntrig' and 'roccat' into...

diff --cc drivers/hid/Kconfig
index 2072e0138e9fd2ef1c0322a229ef6622a45b2aa3,6369ba7f96f8c0cb2bce6ae0301fd2962027f914,6369ba7f96f8c0cb2bce6ae0301fd2962027f914,3892ff5fa11b8038c8317f375eec5f3e397c19f7,6369ba7f96f8c0cb2bce6ae0301fd2962027f914,6369ba7f96f8c0cb2bce6ae0301fd2962027f914,b07440a172b5dae8d7ca62d63de66f96aa5a2c6b..68a7e862068ea90936c56571cd317a242c504690
--- 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
@@@@@@@@ -376,8 -376,8 -376,8 -384,8 -376,8 -376,8 -376,15 +384,15 @@@@@@@@ config HID_ROCCAT_KON
        ---help---
        Support for Roccat Kone mouse.
       
++++++ config HID_ROCCAT_PYRA
++++++  tristate "Roccat Pyra mouse support"
++++++  depends on USB_HID
++++++  select HID_ROCCAT
++++++  ---help---
++++++  Support for Roccat Pyra mouse.
++++++ 
       config HID_SAMSUNG
 ------ tristate "Samsung"
 ++++++ tristate "Samsung InfraRed remote control or keyboards"
        depends on USB_HID
        ---help---
        Support for Samsung InfraRed remote control or keyboards.

diff --cc drivers/hid/Makefile
Simple merge

diff --cc drivers/hid/hid-core.c
index 5ac2be978c922995910c2b9f4185be5eabd7d03a,3f7292486024b8feace0b72775c03a2ae122e8fc,3f7292486024b8feace0b72775c03a2ae122e8fc,0120557022bf4312a3398de6d6d1afdb104c1bf7,d2f9c4aa4b52d356e326e90978ecd6a5b5bb476e,0c52899be9643d85af5c7ac6be8c87bc67d6e6ce,18608b89e76bda21d13f3966d9dcf1209ee18062..cb7dc99d8b290d6526520330500c48c99672dc1f
--- 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
@@@@@@@@ -1286,14 -1285,13 -1285,13 -1285,13 -1286,10 -1285,10 -1285,10 +1287,14 @@@@@@@@ static const struct hid_device_id hid_b
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
    +++ { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_T91MT) },
    +++ { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUSTEK_MULTITOUCH_YFO) },
        { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
        { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) },
    +++ { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) },
 ++++++ { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },

diff --cc drivers/hid/hid-ids.h
Simple merge

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

diff --cc drivers/hid/usbhid/hid-core.c
index 7a778ac4c5cb21f191d53a0e0e63094f7aa94e4a,599041a7f670a9f105e00da3272d79642aefb78c,599041a7f670a9f105e00da3272d79642aefb78c,39913f51d88148175163f367d8b9c11b82875d11,b729c02866798c00ae4d2c77eadba097a79d7f73,b729c02866798c00ae4d2c77eadba097a79d7f73,b729c02866798c00ae4d2c77eadba097a79d7f73..5489eab3a6bd09e9aaf443cc7961f52267aff4a6
--- 1/drivers/hid/usbhid/hid-core.c
--- 2/drivers/hid/usbhid/hid-core.c
--- 3/drivers/hid/usbhid/hid-core.c
--- 4/drivers/hid/usbhid/hid-core.c
--- 5/drivers/hid/usbhid/hid-core.c
--- 6/drivers/hid/usbhid/hid-core.c
--- 7/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@@@@@@@ -807,10 -807,9 -807,9 -807,9 -807,9 -807,9 -807,9 +807,10 @@@@@@@@ static int usbhid_output_raw_report(str
        struct usb_host_interface *interface = intf->cur_altsetting;
        int ret;
       
--- --- if (usbhid->urbout) {
+++ +++ if (usbhid->urbout && report_type != HID_FEATURE_REPORT) {
                int actual_length;
                int skipped_report_id = 0;
 ++++++
                if (buf[0] == 0x0) {
                        /* Don't send the Report ID */
                        buf++;

diff --cc drivers/hid/usbhid/hid-quirks.c
index f90e937b577f9de10baf8f11441f55c5b230ee11,70da3181c8a0467663c15abd324dd6fbe801ea51,7ff7e3d4b950a47b790f80eea2d313e52af8deb9,70da3181c8a0467663c15abd324dd6fbe801ea51,2643d31476213cd41f5d1b39042e83d5a70a63a4,2643d31476213cd41f5d1b39042e83d5a70a63a4,2643d31476213cd41f5d1b39042e83d5a70a63a4..836a87473c5851e29ae32081aacc63f290ec24af
--- 1/drivers/hid/usbhid/hid-quirks.c
--- 2/drivers/hid/usbhid/hid-quirks.c
--- 3/drivers/hid/usbhid/hid-quirks.c
--- 4/drivers/hid/usbhid/hid-quirks.c
--- 5/drivers/hid/usbhid/hid-quirks.c
--- 6/drivers/hid/usbhid/hid-quirks.c
--- 7/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@@@@@@@ -33,10 -33,9 -33,8 -33,9 -33,8 -33,8 -33,8 +33,9 @@@@@@@@ static const struct hid_blacklist 
        { USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_PREDATOR, HID_QUIRK_BADPAD },
        { USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD, HID_QUIRK_BADPAD },
        { USB_VENDOR_ID_CHIC, USB_DEVICE_ID_CHIC_GAMEPAD, HID_QUIRK_BADPAD },
    --- { USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH, HID_QUIRK_MULTI_INPUT },
    +++ { USB_VENDOR_ID_DWAV, USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER, HID_QUIRK_MULTI_INPUT | HID_QUIRK_NOGET },
-- -    { USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH, HID_QUIRK_MULTI_INPUT },
        { USB_VENDOR_ID_MOJO, USB_DEVICE_ID_RETRO_ADAPTER, HID_QUIRK_MULTI_INPUT },
 ++++++ { USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_TOUCHSCREEN_MOSART, HID_QUIRK_MULTI_INPUT },
        { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
        { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
        { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },