Merge branches 'dragonrise', 'hidraw-feature', 'multitouch', 'ntrig', 'roccat', ...

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/hid/Makefile
index bb744e6f75e6cf46429f2b0eff50138381b95736,6efc2a0370ad1e8e7ff575653a4778b53aab4eea,29e98985b901ebc19a555c0c655240e7ad1fdf15,6efc2a0370ad1e8e7ff575653a4778b53aab4eea,cb80181da905a7e6270b33fa4ef14d541241080e,125ba103eba08fe4e0e6531db372a793f56be62c,6efc2a0370ad1e8e7ff575653a4778b53aab4eea..06c68ae3abeea3cb05c27c346f61dd60e3b7a7f9
--- 1/drivers/hid/Makefile
--- 2/drivers/hid/Makefile
--- 3/drivers/hid/Makefile
--- 4/drivers/hid/Makefile
--- 5/drivers/hid/Makefile
--- 6/drivers/hid/Makefile
--- 7/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@@@@@@@ -34,9 -34,9 -34,8 -34,9 -34,9 -34,9 -34,9 +34,8 @@@@@@@@ obj-$(CONFIG_HID_CANDO)               += hid-cando.
       obj-$(CONFIG_HID_CHERRY) += hid-cherry.o
       obj-$(CONFIG_HID_CHICONY)        += hid-chicony.o
       obj-$(CONFIG_HID_CYPRESS)        += hid-cypress.o
 ------obj-$(CONFIG_HID_DRAGONRISE)     += hid-drff.o
 ++++++obj-$(CONFIG_HID_DRAGONRISE)     += hid-dr.o
       obj-$(CONFIG_HID_EMS_FF) += hid-emsff.o
-- ----obj-$(CONFIG_HID_EGALAX) += hid-egalax.o
       obj-$(CONFIG_HID_ELECOM) += hid-elecom.o
       obj-$(CONFIG_HID_EZKEY)          += hid-ezkey.o
       obj-$(CONFIG_HID_GYRATION)       += hid-gyration.o

diff --cc drivers/hid/hid-core.c
index 75af1f83532011b5b9a2c28796c8d6584b27fcc0,d678cf3d33d5eaf80ab46a7ea58bcd369637c308,a5f6439fa78e216eaae73cd6806805f0e5307194,d678cf3d33d5eaf80ab46a7ea58bcd369637c308,0180f20d4fa78df39926d59ac57739c9e80ef6be,c650efb52a45774bb67e2519ed29f3517138320e,f99413b6cb880a230b0a34cdac2c0f720f8a3bea..c3d66269ed7d584bb655be926cef4b8e073699a9
--- 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
--- 6/drivers/hid/hid-core.c
--- 7/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@@@@@@ -1346,9 -1345,9 -1345,10 -1345,9 -1345,9 -1376,11 -1345,9 +1377,12 @@@@@@@@ static const struct hid_device_id hid_h
        { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) },
        { HID_USB_DEVICE(USB_VENDOR_ID_HANVON, USB_DEVICE_ID_HANVON_MULTITOUCH) },
++ ++++ { HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS, USB_DEVICE_ID_IRTOUCH_INFRARED_USB) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },
+++++ + { HID_USB_DEVICE(USB_VENDOR_ID_KEYTOUCH, USB_DEVICE_ID_KEYTOUCH_IEC) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },
+++++ + { HID_USB_DEVICE(USB_VENDOR_ID_LCPOWER, USB_DEVICE_ID_LCPOWER_LC1000 ) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2) },

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

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

diff --cc include/linux/hid.h
Simple merge

diff --cc net/bluetooth/hidp/core.c
Simple merge