Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (48 commits)
  HID: add support for Logitech Driving Force Pro wheel
  HID: hid-ortek: remove spurious reference
  HID: add support for Ortek PKB-1700
  HID: roccat-koneplus: vorrect mode of sysfs attr 'sensor'
  HID: hid-ntrig: init settle and mode check
  HID: merge hid-egalax into hid-multitouch
  HID: hid-multitouch: Send events per slot if CONTACTCOUNT is missing
  HID: ntrig remove if and drop an indent
  HID: ACRUX - activate the device immediately after binding
  HID: ntrig: apply NO_INIT_REPORTS quirk
  HID: hid-magicmouse: Correct touch orientation direction
  HID: ntrig don't dereference unclaimed hidinput
  HID: Do not create input devices for feature reports
  HID: bt hidp: send Output reports using SET_REPORT on the Control channel
  HID: hid-sony.c: Fix sending Output reports to the Sixaxis
  HID: add support for Keytouch IEC 60945
  HID: Add HID Report Descriptor to sysfs
  HID: add IRTOUCH infrared USB to hid_have_special_driver
  HID: kernel oops in out_cleanup in function hidinput_connect
  HID: Add teletext/color keys - gyration remote - EU version (GYAR3101CKDE)
  ...

1 files changed, 13 insertions, 0 deletions

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 92a0d61a7379..d485894ff4db 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -333,6 +333,9 @@
 #define USB_VENDOR_ID_IMATION           0x0718
 #define USB_DEVICE_ID_DISC_STAKKA       0xd000
 
+#define USB_VENDOR_ID_IRTOUCHSYSTEMS    0x6615
+#define USB_DEVICE_ID_IRTOUCH_INFRARED_USB      0x0070
+
 #define USB_VENDOR_ID_JESS              0x0c45
 #define USB_DEVICE_ID_JESS_YUREX        0x1010
 
@@ -345,6 +348,9 @@
 #define USB_VENDOR_ID_KWORLD            0x1b80
 #define USB_DEVICE_ID_KWORLD_RADIO_FM700        0xd700
 
+#define USB_VENDOR_ID_KEYTOUCH          0x0926
+#define USB_DEVICE_ID_KEYTOUCH_IEC      0x3333
+
 #define USB_VENDOR_ID_KYE               0x0458
 #define USB_DEVICE_ID_KYE_ERGO_525V     0x0087
 #define USB_DEVICE_ID_KYE_GPEN_560      0x5003
@@ -352,6 +358,9 @@
 #define USB_VENDOR_ID_LABTEC            0x1020
 #define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD  0x0006
 
+#define USB_VENDOR_ID_LCPOWER           0x1241
+#define USB_DEVICE_ID_LCPOWER_LC1000    0xf767
+
 #define USB_VENDOR_ID_LD                0x0f11
 #define USB_DEVICE_ID_LD_CASSY          0x1000
 #define USB_DEVICE_ID_LD_POCKETCASSY    0x1010
@@ -383,6 +392,7 @@
 #define USB_DEVICE_ID_LOGITECH_WHEEL    0xc294
 #define USB_DEVICE_ID_LOGITECH_WINGMAN_FFG      0xc293
 #define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL       0xc295
+#define USB_DEVICE_ID_LOGITECH_DFP_WHEEL        0xc298
 #define USB_DEVICE_ID_LOGITECH_G25_WHEEL        0xc299
 #define USB_DEVICE_ID_LOGITECH_WII_WHEEL        0xc29c
 #define USB_DEVICE_ID_LOGITECH_ELITE_KBD        0xc30a
@@ -466,6 +476,7 @@
 #define USB_DEVICE_ID_ONTRAK_ADU100     0x0064
 
 #define USB_VENDOR_ID_ORTEK             0x05a4
+#define USB_DEVICE_ID_ORTEK_PKB1700     0x1700
 #define USB_DEVICE_ID_ORTEK_WKB2000     0x2000
 
 #define USB_VENDOR_ID_PANJIT            0x134c
@@ -496,8 +507,10 @@
 #define USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN   0x3001
 
 #define USB_VENDOR_ID_ROCCAT            0x1e7d
+#define USB_DEVICE_ID_ROCCAT_ARVO       0x30d4
 #define USB_DEVICE_ID_ROCCAT_KONE       0x2ced
 #define USB_DEVICE_ID_ROCCAT_KONEPLUS   0x2d51
+#define USB_DEVICE_ID_ROCCAT_KOVAPLUS   0x2d50
 #define USB_DEVICE_ID_ROCCAT_PYRA_WIRED 0x2c24
 #define USB_DEVICE_ID_ROCCAT_PYRA_WIRELESS      0x2cf6