From: Jiri Kosina Date: Tue, 5 Sep 2017 09:11:52 +0000 (+0200) Subject: Merge branch 'for-4.14/multitouch' into for-linus X-Git-Tag: v4.14-rc1~140^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=38e50c9ba84ad755247220ce6a881fbdb44aaeec;p=platform%2Fkernel%2Flinux-exynos.git Merge branch 'for-4.14/multitouch' into for-linus - support for media keys on Asus T304UA from João Paulo Rechi Vita - support for Microsoft Win8 Wireless Radio Controls extensions from João Paulo Rechi Vita Conflicts: drivers/hid/hid-ids.h Signed-off-by: Jiri Kosina --- 38e50c9ba84ad755247220ce6a881fbdb44aaeec diff --cc drivers/hid/hid-ids.h index 40d56b4,90fcf74..b397a14 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@@ -176,7 -176,7 +176,8 @@@ #define USB_DEVICE_ID_ASUSTEK_LCM 0x1726 #define USB_DEVICE_ID_ASUSTEK_LCM2 0x175b #define USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD 0x17e0 +#define USB_DEVICE_ID_ASUSTEK_T100CHI_KEYBOARD 0x8502 + #define USB_DEVICE_ID_ASUSTEK_T304_KEYBOARD 0x184a #define USB_DEVICE_ID_ASUSTEK_I2C_KEYBOARD 0x8585 #define USB_DEVICE_ID_ASUSTEK_I2C_TOUCHPAD 0x0101 #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1 0x1854