From: Jiri Kosina <jkosina@suse.cz>
Date: Wed, 4 Jun 2014 11:09:01 +0000 (+0200)
Subject: Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus
X-Git-Tag: next-20140610~50^2~6^2~1
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=af5666e0f76023d9c296016024297903a4c83108;p=karo-tx-linux.git

Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus

Conflicts:
	drivers/hid/hid-sensor-hub.c
---

af5666e0f76023d9c296016024297903a4c83108
diff --cc drivers/hid/hid-sensor-hub.c
index be14b5690e94,39bb6f253e23..a8d5c8faf8cf
--- a/drivers/hid/hid-sensor-hub.c
+++ b/drivers/hid/hid-sensor-hub.c
@@@ -705,12 -705,21 +705,21 @@@ static const struct hid_device_id senso
  	{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_SENSOR_HUB, USB_VENDOR_ID_INTEL_1,
  			USB_DEVICE_ID_INTEL_HID_SENSOR_1),
  			.driver_data = HID_SENSOR_HUB_ENUM_QUIRK},
 -	{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_SENSOR_HUB, USB_VENDOR_ID_STM_0,
 -			USB_DEVICE_ID_STM_HID_SENSOR),
 -			.driver_data = HID_SENSOR_HUB_ENUM_QUIRK},
+ 	{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_SENSOR_HUB, USB_VENDOR_ID_MICROSOFT,
+ 			USB_DEVICE_ID_MS_SURFACE_PRO_2),
+ 			.driver_data = HID_SENSOR_HUB_ENUM_QUIRK},
+ 	{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_SENSOR_HUB, USB_VENDOR_ID_MICROSOFT,
+ 			USB_DEVICE_ID_MS_TOUCH_COVER_2),
+ 			.driver_data = HID_SENSOR_HUB_ENUM_QUIRK},
+ 	{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_SENSOR_HUB, USB_VENDOR_ID_MICROSOFT,
+ 			USB_DEVICE_ID_MS_TYPE_COVER_2),
+ 			.driver_data = HID_SENSOR_HUB_ENUM_QUIRK},
  	{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_SENSOR_HUB, USB_VENDOR_ID_STM_0,
- 			USB_DEVICE_ID_STM_HID_SENSOR),
+ 			USB_DEVICE_ID_STM_HID_SENSOR_1),
  			.driver_data = HID_SENSOR_HUB_ENUM_QUIRK},
 +	{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_SENSOR_HUB, USB_VENDOR_ID_TEXAS_INSTRUMENTS,
 +			USB_DEVICE_ID_TEXAS_INSTRUMENTS_LENOVO_YOGA),
 +			.driver_data = HID_SENSOR_HUB_ENUM_QUIRK},
  	{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_SENSOR_HUB, HID_ANY_ID,
  		     HID_ANY_ID) },
  	{ }