Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid', 'for...

Conflicts:
	drivers/hid/hid-core.c

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/hid/Makefile
Simple merge

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

diff --cc drivers/hid/hid-core.c
index 52146dbf080f5a836e3f83bd59cf488be1949f26,f4109fd657ff7a337761f9029969dde8ee71e3cc,f4109fd657ff7a337761f9029969dde8ee71e3cc,b5974cd4596861e9f8d3a2659c066924c0bf6f41,9904776a706593373bfd928e23d8e98e6e77e6e0,c96e548cd7b85e4fbfdb9920ee96aa88476be153,2629d5240d63cd29300895e3f8e985f97a175605..eb2ee11b6412ac43e9baa08596b881d92c8430e3
--- 1/drivers/hid/hid-core.c
--- 2/drivers/hid/hid-core.c
--- 3/drivers/hid/hid-core.c
--- 4/drivers/hid/hid-core.c
--- 5/drivers/hid/hid-core.c
--- 6/drivers/hid/hid-core.c
--- 7/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) },

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

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

diff --cc drivers/hid/hid-sensor-hub.c
Simple merge

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

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