From: Stephen Rothwell Date: Mon, 10 Sep 2012 01:33:46 +0000 (+1000) Subject: Merge remote-tracking branch 'hid/for-next' X-Git-Tag: next-20120910~87 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=29696a373638276811b43dfb63829520607e20eb;p=karo-tx-linux.git Merge remote-tracking branch 'hid/for-next' Conflicts: drivers/hid/usbhid/hid-quirks.c --- 29696a373638276811b43dfb63829520607e20eb diff --cc drivers/hid/usbhid/hid-quirks.c index 991e85c7325c,9af530e4555c..11c7932dc7e6 --- a/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 },