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

Pull HID updates from Jiri Kosina:
 - substantial cleanup of the generic and transport layers, in the
   direction of an ultimate goal of making struct hid_device completely
   transport independent, by Benjamin Tissoires
 - cp2112 driver from David Barksdale
 - a lot of fixes and new hardware support (Dualshock 4) to hid-sony
   driver, by Frank Praznik
 - support for Win 8.1 multitouch protocol by Andrew Duggan
 - other smaller fixes / device ID additions

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (75 commits)
  HID: sony: fix force feedback mismerge
  HID: sony: Set the quriks flag for Bluetooth controllers
  HID: sony: Fix Sixaxis cable state detection
  HID: uhid: Add UHID_CREATE2 + UHID_INPUT2
  HID: hyperv: fix _raw_request() prototype
  HID: hyperv: Implement a stub raw_request() entry point
  HID: hid-sensor-hub: fix sleeping function called from invalid context
  HID: multitouch: add support for Win 8.1 multitouch touchpads
  HID: remove hid_output_raw_report transport implementations
  HID: sony: do not rely on hid_output_raw_report
  HID: cp2112: remove the last hid_output_raw_report() call
  HID: cp2112: remove various hid_out_raw_report calls
  HID: multitouch: add support of other generic collections in hid-mt
  HID: multitouch: remove pen special handling
  HID: multitouch: remove registered devices with default behavior
  HID: hidp: Add a comment that some devices depend on the current behavior of uniq
  HID: sony: Prevent duplicate controller connections.
  HID: sony: Perform a boundry check on the sixaxis battery level index.
  HID: sony: Fix work queue issues
  HID: sony: Fix multi-line comment styling
  ...

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

diff --cc drivers/hid/hid-ids.h
index 830de69d2df025b2295c049a0728f4fa1804b725,548c1a51959334e867b27c73ae20d682515c9149..bd221263c739d61f8df1be33b0a0ea0181d76657
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -242,9 -245,8 +245,10 @@@
  #define USB_VENDOR_ID_CYGNAL          0x10c4
  #define USB_DEVICE_ID_CYGNAL_RADIO_SI470X     0x818a
  #define USB_DEVICE_ID_FOCALTECH_FTXXXX_MULTITOUCH     0x81b9
+ #define USB_DEVICE_ID_CYGNAL_CP2112   0xea90
  
 +#define USB_DEVICE_ID_CYGNAL_RADIO_SI4713       0x8244
 +
  #define USB_VENDOR_ID_CYPRESS         0x04b4
  #define USB_DEVICE_ID_CYPRESS_MOUSE   0x0001
  #define USB_DEVICE_ID_CYPRESS_HIDCOM  0x5500

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

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