From: Jiri Kosina Date: Wed, 12 Dec 2012 20:41:55 +0000 (+0100) Subject: Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid', 'for... X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=818b930bc15077fc00ff16bb22c5df1857f05afa;p=deliverable%2Flinux.git Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid', 'for-3.8/multitouch', 'for-3.8/roccat', 'for-3.8/sensors' and 'for-3.8/upstream' into for-linus Conflicts: drivers/hid/hid-core.c --- 818b930bc15077fc00ff16bb22c5df1857f05afa diff --cc drivers/hid/hid-core.c index 52146dbf080f,f4109fd657ff,f4109fd657ff,b5974cd45968,9904776a7065,c96e548cd7b8,2629d5240d63..eb2ee11b6412 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@@@@@@@ -1572,10 -1571,10 -1571,10 -1589,10 -1568,10 -1580,6 -1568,11 +1599,7 @@@@@@@@ static const struct hid_device_id hid_h { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) }, { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK, USB_DEVICE_ID_HOLTEK_ON_LINE_GRIP) }, { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD) }, ----- - { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8086, USB_DEVICE_ID_SENSOR_HUB_1020) }, ----- - { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8086, USB_DEVICE_ID_SENSOR_HUB_09FA) }, ----- - { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8087, USB_DEVICE_ID_SENSOR_HUB_1020) }, ----- - { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8087, USB_DEVICE_ID_SENSOR_HUB_09FA) }, ++++++ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ION, USB_DEVICE_ID_ICADE) }, { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) }, { HID_USB_DEVICE(USB_VENDOR_ID_KEYTOUCH, USB_DEVICE_ID_KEYTOUCH_IEC) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) },