Merge branches 'ntrig', 'picolcd', 'prodikeys' and 'roccat-kone' into for-linus

Conflicts:
	drivers/hid/Makefile

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/hid/Makefile
index 2e196c734d2ae1d93ded22cbe94f3f3753afc229,0b2618f092ca525b272bf10242ff4843b68cfce2,7fd1614e7e2c5c76bd7ae202b67cc29e5859fea6,f637b388030f41c0c940b68a35f1017c3cabf28a,08b83ccd9d1b505e39b884bfca83bfc3e4043d95..22e47eaeea322ffd4e64c329e0e7be6139e9321b
--- 1/drivers/hid/Makefile
--- 2/drivers/hid/Makefile
--- 3/drivers/hid/Makefile
--- 4/drivers/hid/Makefile
--- 5/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@@@@@ -46,6 -44,6 -44,7 -45,6 -44,7 +47,8 @@@@@@ obj-$(CONFIG_HID_PRODIKEYS)   += hid-prod
     obj-$(CONFIG_HID_QUANTA)   += hid-quanta.o
     obj-$(CONFIG_HID_PANTHERLORD)      += hid-pl.o
     obj-$(CONFIG_HID_PETALYNX) += hid-petalynx.o
++ ++obj-$(CONFIG_HID_PICOLCD)  += hid-picolcd.o
++++ obj-$(CONFIG_HID_ROCCAT_KONE)      += hid-roccat-kone.o
     obj-$(CONFIG_HID_SAMSUNG)  += hid-samsung.o
     obj-$(CONFIG_HID_SMARTJOYPLUS)     += hid-sjoy.o
     obj-$(CONFIG_HID_SONY)             += hid-sony.o

diff --cc drivers/hid/hid-core.c
index ef492d3d52ee3e9366f7c185dfed3b7a55bcddf4,143e788b729b1bdaadb4888e3568dac3a6714b0c,bb11fb460d552f10250216cd0db5541e213c051a,1c57a9391c8f2878b02b4117a7082dd6fc612841,5c5a821cd4cb3c0681e7f8e9a1d8a0767ffbe62b..e10e314d38cc8e620e2bc75ee3a3a3899d0e837b
--- 1/drivers/hid/hid-core.c
--- 2/drivers/hid/hid-core.c
--- 3/drivers/hid/hid-core.c
--- 4/drivers/hid/hid-core.c
--- 5/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@@@@ -1281,12 -1290,9 -1295,8 -1290,10 -1295,8 +1281,13 @@@@@@ static const struct hid_device_id hid_b
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
        { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
 ++++   { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) },
 ++++   { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH) },
 ++++   { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
  + +   { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
+++ +   { HID_USB_DEVICE(USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_PRODIKEYS_PCMIDI) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3) },
@@@@@@ -1337,8 -1342,7 -1348,7 -1343,7 -1346,8 +1340,9 @@@@@@
        { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },
        { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },
++++    { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONE) },
        { 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_SONY, USB_DEVICE_ID_SONY_PS3_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) },

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

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