From: Jiri Kosina <jkosina@suse.cz>
Date: Wed, 28 May 2014 14:28:59 +0000 (+0200)
Subject: Merge branch 'for-3.16/upstream' into for-next
X-Git-Tag: next-20140530~86^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5044df95c5c2923f6d0a3b842b72ee51727ddc99;p=karo-tx-linux.git

Merge branch 'for-3.16/upstream' into for-next

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

5044df95c5c2923f6d0a3b842b72ee51727ddc99
diff --cc drivers/hid/hid-sensor-hub.c
index be14b5690e94,8a50d9301feb..eefaaf641a91
--- a/drivers/hid/hid-sensor-hub.c
+++ b/drivers/hid/hid-sensor-hub.c
@@@ -708,9 -708,15 +708,18 @@@ static const struct hid_device_id senso
  	{ 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_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, 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, HID_ANY_ID,
  		     HID_ANY_ID) },
  	{ }