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

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/hid/hid-core.c
index c3d6626,9f15c92,408c4be,84df80e..4140fd2
--- 1/drivers/hid/hid-core.c
--- 2/drivers/hid/hid-core.c
--- 3/drivers/hid/hid-core.c
--- 4/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-ids.h
Simple merge

diff --cc drivers/hid/hid-lgff.c
index 90d0ef2,90d0ef2,f099079,f901349..088f850
--- 1/drivers/hid/hid-lgff.c
--- 2/drivers/hid/hid-lgff.c
--- 3/drivers/hid/hid-lgff.c
--- 4/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 },
    };
    

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

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

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

diff --cc samples/Kconfig
Simple merge