Merge branch 'master' into upstream

Conflicts:
	drivers/hid/hid-ids.h

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

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

diff --cc drivers/hid/hid-ids.h
index bb5f4fa479adafdb0a37dcb704a6759085429e07,010368e649ed2fc54ca3832add6e91c1ea791ea2..39ff98a5bd6169152e2fca864f7cc666288e32ac
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -169,9 -169,9 +172,12 @@@
  #define USB_VENDOR_ID_ESSENTIAL_REALITY       0x0d7f
  #define USB_DEVICE_ID_ESSENTIAL_REALITY_P5 0x0100
  
 +#define USB_VENDOR_ID_ETURBOTOUCH     0x22b9
 +#define USB_DEVICE_ID_ETURBOTOUCH     0x0006
 +
+ #define USB_VENDOR_ID_ETT             0x0664
+ #define USB_DEVICE_ID_TC5UH           0x0309
+ 
  #define USB_VENDOR_ID_EZKEY           0x0518
  #define USB_DEVICE_ID_BTC_8193                0x0002
  

diff --cc drivers/hid/hid-lg.h
Simple merge

diff --cc drivers/hid/usbhid/hid-core.c
Simple merge

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