Merge branch 'upstream' into for-linus

Conflicts:
	drivers/hid/hid-core.c
	drivers/hid/hid-ids.h

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 c5606724b77a0082dfb7d24aa36c8a3d0afe31a5,e345370dc524215dae178cef9c16ae69f27630b4..91adcc5bad284ea6cd28e301a237b554de959bb8
--- 1/drivers/hid/hid-core.c
--- 2/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@ -1346,9 -1356,12 +1362,15 @@@ static const struct hid_device_id hid_h
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },
 -      { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI) },
 -      { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO) },
 -      { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ANSI) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ISO) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_JIS) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ISO) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_JIS) },
++      { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI) },
++      { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO) },
++      { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },

diff --cc drivers/hid/hid-ids.h
index d5dbb1a4f76b2097fcbaf741645d0bb9362622d5,fba6ceb0ed0ee1e79b0c31f47b236fe6c8ed737d..1680e99b4816a8558291293d38dcc43625640e9c
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -109,9 -109,12 +109,15 @@@
  #define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI  0x0245
  #define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO   0x0246
  #define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS   0x0247
 +#define USB_DEVICE_ID_APPLE_ALU_REVB_ANSI     0x024f
 +#define USB_DEVICE_ID_APPLE_ALU_REVB_ISO      0x0250
 +#define USB_DEVICE_ID_APPLE_ALU_REVB_JIS      0x0251
+ #define USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI 0x0249
+ #define USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO  0x024a
+ #define USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS  0x024b
+ #define USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI  0x024c
+ #define USB_DEVICE_ID_APPLE_WELLSPRING6_ISO   0x024d
+ #define USB_DEVICE_ID_APPLE_WELLSPRING6_JIS   0x024e
  #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI  0x0239
  #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO   0x023a
  #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS   0x023b

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

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

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