From: Jiri Kosina Date: Tue, 1 Apr 2014 17:06:41 +0000 (+0200) Subject: Merge branch 'for-3.15/microsoft' into for-linus X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6cf8c85f8bc320ca0273c5261cc13ee1491d7b92;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'for-3.15/microsoft' into for-linus Conflicts: drivers/hid/hid-core.c --- 6cf8c85f8bc320ca0273c5261cc13ee1491d7b92 diff --cc drivers/hid/hid-core.c index 3736f6a121b7,cd33ec66133e..dbe548b22b2a --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@@ -1821,8 -1779,7 +1821,9 @@@ static const struct hid_device_id hid_h { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) }, + { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2) }, + { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2) }, + { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) }, { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) }, { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) }, { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1) },