Merge branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linus

Conflicts:
	drivers/hid/hid-core.c

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/hid/Makefile
index 93017043f6f8a6e5257d1a7be0be45db02559f81,b62215716b2fd66fda16b0084f077927a8c3f02f,247f2b81677a374bd9f9b4eb89901e436ebae950..72d1b0bc0a97398a9e0294c4f391553b979b9ffa
--- 1/drivers/hid/Makefile
--- 2/drivers/hid/Makefile
--- 3/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@@@ -101,9 -101,8 -101,9 +101,10 @@@@ obj-$(CONFIG_HID_SAMSUNG)        += hid-samsun
   obj-$(CONFIG_HID_SMARTJOYPLUS)       += hid-sjoy.o
   obj-$(CONFIG_HID_SONY)               += hid-sony.o
   obj-$(CONFIG_HID_SPEEDLINK)  += hid-speedlink.o
++ obj-$(CONFIG_HID_STEELSERIES)        += hid-steelseries.o
   obj-$(CONFIG_HID_SUNPLUS)    += hid-sunplus.o
   obj-$(CONFIG_HID_GREENASIA)  += hid-gaff.o
 ++obj-$(CONFIG_HID_THINGM)     += hid-thingm.o
   obj-$(CONFIG_HID_THRUSTMASTER)       += hid-tmff.o
   obj-$(CONFIG_HID_TIVO)               += hid-tivo.o
   obj-$(CONFIG_HID_TOPSEED)    += hid-topseed.o

diff --cc drivers/hid/hid-core.c
index 6e904155ded51332e1852a0f60ced082012847ee,1651728b5aa444528b0e7c7342ad75c645a9434a,65cda7f958224a67e4c5d154d5962c9593c6e9d9..ff75cabf7393f3d29c8b05c77f11cf2b8828a132
--- 1/drivers/hid/hid-core.c
--- 2/drivers/hid/hid-core.c
--- 3/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@@ -1702,8 -1697,8 -1697,8 +1702,9 @@@@ static const struct hid_device_id hid_h
        { 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_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE) },
++      { HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES, USB_DEVICE_ID_STEELSERIES_SRWS1) },
        { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
 ++     { HID_USB_DEVICE(USB_VENDOR_ID_THINGM, USB_DEVICE_ID_BLINK1) },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb323) },

diff --cc drivers/hid/hid-ids.h
Simple merge

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