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 <jkosina@suse.cz>

diff --cc drivers/hid/hid-ids.h
index 40d56b42c83b280efc2c5ad62604d697b00f0e50,90fcf7457908f3e1c2234496980e5186dec3bdf5..b397a14ab9703b259d7b258ebcfdc9d582b31b07
--- 1/drivers/hid/hid-ids.h
--- 2/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

diff --cc drivers/hid/hid-multitouch.c
Simple merge

diff --cc include/linux/hid.h
Simple merge