From: Jiri Kosina <jkosina@suse.cz>
Date: Mon, 23 May 2011 10:49:25 +0000 (+0200)
Subject: Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus
X-Git-Tag: Ubuntu-5.0.0-8.9~18964^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=366a2382c68d01638350efcf23d46a47d661c595;p=mirror_ubuntu-disco-kernel.git

Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus
---

366a2382c68d01638350efcf23d46a47d661c595
diff --cc drivers/hid/hid-core.c
index c3d66269ed7d,9f15c9238fb2,408c4bea4d8d,84df80e3efc1..4140fd271417
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@@@ -1446,9 -1453,9 -1449,11 -1450,10 +1460,12 @@@@@ static const struct hid_device_id hid_h
    	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPLUS) },
    	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KOVAPLUS) },
    	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_PYRA_WIRED) },
++ +	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_PYRA_WIRELESS) },
    	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
    	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) },
++ +	{ HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) },
    	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
+++ 	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER) },
    	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
    	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
    	{ HID_USB_DEVICE(USB_VENDOR_ID_STANTUM, USB_DEVICE_ID_MTP) },
diff --cc drivers/hid/hid-lgff.c
index 90d0ef2c92be,90d0ef2c92be,f099079ca6b9,f901349c30b5..088f85049290
--- a/drivers/hid/hid-lgff.c
+++ b/drivers/hid/hid-lgff.c
@@@@@ -72,7 -72,7 -72,9 -72,10 +72,12 @@@@@ static const struct dev_type devices[] 
    	{ 0x046d, 0xc287, ff_joystick_ac },
    	{ 0x046d, 0xc293, ff_joystick },
    	{ 0x046d, 0xc294, ff_wheel },
+++ 	{ 0x046d, 0xc298, ff_wheel },
+++ 	{ 0x046d, 0xc299, ff_wheel },
+++ 	{ 0x046d, 0xc29b, ff_wheel },
    	{ 0x046d, 0xc295, ff_joystick },
++ +	{ 0x046d, 0xc298, ff_wheel },
++ +	{ 0x046d, 0xc299, ff_wheel },
    	{ 0x046d, 0xca03, ff_wheel },
    };