Merge branch 'upstream' into for-linus

Conflicts:
	drivers/hid/usbhid/hid-quirks.c

diff --cc drivers/hid/Kconfig
Simple merge

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

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

diff --cc drivers/hid/hid-lenovo-tpkbd.c
Simple merge

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

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

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

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

diff --cc drivers/hid/usbhid/hid-quirks.c
index 991e85c7325c849d4e7c287afe28364a8e3351e6,9af530e4555c519be2c54c3fb96f0d391363a3eb..11c7932dc7e6c5628f940d141b50366ca57008ad
--- 1/drivers/hid/usbhid/hid-quirks.c
--- 2/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@@ -70,7 -70,7 +70,8 @@@ static const struct hid_blacklist 
        { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },
+       { USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET },
 +      { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NO_INIT_REPORTS },
        { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1, HID_QUIRK_NO_INIT_REPORTS },
        { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN2, HID_QUIRK_NO_INIT_REPORTS },