Merge branches 'for-4.8/alps', 'for-4.8/apple', 'for-4.8/i2c-hid', 'for-4.8/uhid...

diff --combined drivers/hid/hid-core.c
index 7f989f6,21eadd9,8ea3a26,8ea3a26,8ea3a26..873a8af
--- 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
+++ b/drivers/hid/hid-core.c
@@@@@@ -1772,7 -1772,6 -1772,6 -1772,6 -1772,6 +1772,7 @@@@@@ static const struct hid_device_id hid_h
        { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0xf705) },
 ++++   { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_DUAL) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICMOUSE) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD) },
@@@@@@ -1852,6 -1851,7 -1851,6 -1851,6 -1851,6 +1852,7 @@@@@@
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS) },
+ +++   { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
        { HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_NOTEBOOK_KEYBOARD) },

diff --combined drivers/hid/hid-ids.h
index c4f665d,b5e5415,3eec09a,3eec09a,3eec09a..59ff1fe
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
--- 3/drivers/hid/hid-ids.h
--- 4/drivers/hid/hid-ids.h
--- 5/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@@@@ -70,9 -70,6 -70,6 -70,6 -70,6 +70,9 @@@@@@
     #define USB_VENDOR_ID_ALPS         0x0433
     #define USB_DEVICE_ID_IBM_GAMEPAD  0x1101
     
 ++++#define USB_VENDOR_ID_ALPS_JP              0x044E
 ++++#define HID_DEVICE_ID_ALPS_U1_DUAL 0x120B
 ++++
     #define USB_VENDOR_ID_ANTON                0x1130
     #define USB_DEVICE_ID_ANTON_TOUCH_PAD      0x3101
     
@@@@@@ -145,6 -142,7 -142,6 -142,6 -142,6 +145,7 @@@@@@
     #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI  0x0255
     #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO   0x0256
     #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS   0x0257
+ +++#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI   0x0267
     #define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI       0x0290
     #define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO        0x0291
     #define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS        0x0292