Merge branches 'for-3.19/upstream-fixes', 'for-3.20/apple', 'for-3.20/betop', 'for...

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/hid/Makefile
Simple merge

diff --cc drivers/hid/hid-core.c
index 77afffc6bab83ea4b38260120847d06bd293c2af,c3d0ac1a0988096eaacbe8063b354399b6a85e14,9b1442ac40020dcf294f4b4ca2d201a56f1dbab9,c3d0ac1a0988096eaacbe8063b354399b6a85e14,c3d0ac1a0988096eaacbe8063b354399b6a85e14,ef718f94e7cef50e701361b940df39cd33220236,0cea5a0135b2be3602d9c474f272f2451bf167ba,c3d0ac1a0988096eaacbe8063b354399b6a85e14..db4fb6e1cc5b3ca83d14d3f1e0e52e66fe75979a
--- 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
--- 8/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@@@@@@@ -704,9 -704,9 -704,9 -704,9 -704,9 -705,17 -704,10 -704,9 +705,18 @@@@@@@@@ static void hid_scan_collection(struct 
                        hid->group = HID_GROUP_SENSOR_HUB;
        
                if (hid->vendor == USB_VENDOR_ID_MICROSOFT &&
------ -            hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3 &&
++++++ +            (hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3 ||
++++++ +             hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3_JP) &&
                    hid->group == HID_GROUP_MULTITOUCH)
                        hid->group = HID_GROUP_GENERIC;
+++++ ++
+++++ ++        if ((parser->global.usage_page << 16) == HID_UP_GENDESK)
+++++ ++                for (i = 0; i < parser->local.usage_index; i++)
+++++ ++                        if (parser->local.usage[i] == HID_GD_POINTER)
+++++ ++                                parser->scan_flags |= HID_SCAN_FLAG_GD_POINTER;
+++++ ++
+++++ ++        if ((parser->global.usage_page << 16) >= HID_UP_MSVENDOR)
+++++ ++                parser->scan_flags |= HID_SCAN_FLAG_VENDOR_SPECIFIC;
        }
        
        static int hid_scan_main(struct hid_parser *parser, struct hid_item *item)

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

diff --cc drivers/hid/hid-input.c
index 9505605b6e22a72b29661d568aa6fe4dcaa32643,146da4346b788d805d396a4c3a12c37871ed7f6b,e0a0f06ac5ef6168c8fcdd5c2462df3f3130c941,e0a0f06ac5ef6168c8fcdd5c2462df3f3130c941,e0a0f06ac5ef6168c8fcdd5c2462df3f3130c941,e0a0f06ac5ef6168c8fcdd5c2462df3f3130c941,a758900318ff1a481dac0d29ad39fcbe43a0fdbd,e0a0f06ac5ef6168c8fcdd5c2462df3f3130c941..052869d0ab787da2a3d685c5c6bf905d05e047b8
--- 1/drivers/hid/hid-input.c
--- 2/drivers/hid/hid-input.c
--- 3/drivers/hid/hid-input.c
--- 4/drivers/hid/hid-input.c
--- 5/drivers/hid/hid-input.c
--- 6/drivers/hid/hid-input.c
--- 7/drivers/hid/hid-input.c
--- 8/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@@@@@@@@ -306,14 -306,14 -306,11 -306,11 -306,11 -306,11 -306,11 -306,11 +306,17 @@@@@@@@@ static enum power_supply_property hidin
        
        static const struct hid_device_id hid_battery_quirks[] = {
                { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
- ------                        USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
- ------        HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE },
+ ++++++                USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
+ ++++++          HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE },
+ ++++++        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
+ ++++++                USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),
+ ++++++          HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE },
  ++++++        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
-                                      USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI),
+ ++++++                USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI),
  ++++++          HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE },
 +              { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
  ------                               USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI),
 +++++++                               USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO),
 +                HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE },
                { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
                        USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI),
                  HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE },

diff --cc drivers/hid/hid-logitech-hidpp.c
Simple merge

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