Merge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream' into...

Conflicts:
	drivers/hid/hid-core.c

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/hid/Makefile
index 7a0340ace1860747c087444a908a9f1d2243247a,2065694f57abe482693371988781421404a2485e,833abcf19d68e5098335d5258b538734cd38414c,b15602bfaccfbfee247c5839280c202294ad4242..ffd0d9826d84b91feb9a2bba86684dfac1569f9a
--- 1/drivers/hid/Makefile
--- 2/drivers/hid/Makefile
--- 3/drivers/hid/Makefile
--- 4/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@@@@ -52,8 -51,7 -51,7 -51,8 +52,9 @@@@@ obj-$(CONFIG_HID_ELO)         += hid-elo.
    obj-$(CONFIG_HID_EZKEY)             += hid-ezkey.o
    obj-$(CONFIG_HID_GYRATION)  += hid-gyration.o
    obj-$(CONFIG_HID_HOLTEK)    += hid-holtek-kbd.o
 +++obj-$(CONFIG_HID_HOLTEK)    += hid-holtek-mouse.o
    obj-$(CONFIG_HID_HOLTEK)    += hid-holtekff.o
+++ obj-$(CONFIG_HID_HUION)             += hid-huion.o
    obj-$(CONFIG_HID_HYPERV_MOUSE)      += hid-hyperv.o
    obj-$(CONFIG_HID_ICADE)             += hid-icade.o
    obj-$(CONFIG_HID_KENSINGTON)        += hid-kensington.o

diff --cc drivers/hid/hid-core.c
index b29c956c395c93c8ed35e5de4b64b3ed03de425a,264f550999406f7b924be6634917e3826e80a161,ecd1107a548801813f495ce397393050dc8d1495,27aa7c76b93d6575c6801041c5be400758019a61..e39dac68063cdb2d8cc4816f890d7f45eae9e1f3
--- 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
@@@@@ -1586,8 -1584,6 -1584,6 -1584,7 +1586,9 @@@@@ static const struct hid_device_id hid_h
        { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) },
        { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK, USB_DEVICE_ID_HOLTEK_ON_LINE_GRIP) },
        { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD) },
 +++    { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A) },
 +++    { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067) },
+++     { HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_580) },
        { HID_USB_DEVICE(USB_VENDOR_ID_JESS2, USB_DEVICE_ID_JESS2_COLOR_RUMBLE_PAD) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ION, USB_DEVICE_ID_ICADE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },

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

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

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