From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 25 Oct 2011 07:59:04 +0000 (+0200)
Subject: Merge branch 'upstream' into for-linus
X-Git-Tag: v3.2-rc1~187^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b3aec7b686329e6bb65aa08c7f9458f7fd512f06;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'upstream' into for-linus

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

b3aec7b686329e6bb65aa08c7f9458f7fd512f06
diff --cc drivers/hid/hid-core.c
index c560672,e345370..91adcc5
--- a/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_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_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 d5dbb1a,fba6ceb..1680e99
--- a/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