Merge branch 'upstream' into for-linus

Conflicts:
	drivers/hid/hid-ids.h

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/hid/Makefile
Simple merge

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

diff --cc drivers/hid/hid-ids.h
index 31601ee,f90ef6e..7f0e40b
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -392,26 -395,8 +399,26 @@@
  #define USB_VENDOR_ID_NEXTWINDOW      0x1926
  #define USB_DEVICE_ID_NEXTWINDOW_TOUCHSCREEN  0x0003
  
- #define USB_VENDOR_ID_NTRIG                0x1b96
+ #define USB_VENDOR_ID_NTRIG           0x1b96
  #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN   0x0001
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1   0x0003
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2   0x0004
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3   0x0005
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4   0x0006
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5   0x0007
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6   0x0008
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7   0x0009
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8   0x000A
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9   0x000B
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_10   0x000C
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_11   0x000D
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_12   0x000E
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_13   0x000F
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_14   0x0010
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_15   0x0011
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16   0x0012
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17   0x0013
 +#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18   0x0014
  
  #define USB_VENDOR_ID_ONTRAK          0x0a07
  #define USB_DEVICE_ID_ONTRAK_ADU100   0x0064