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

Pull HID update from Jiri Kosina:

 - fixes for several bugs in incorrect allocations of buffers by David
   Herrmann and Benjamin Tissoires.

 - support for a few new device IDs by Archana Patni, Benjamin
   Tissoires, Huei-Horng Yo, Reyad Attiyat and Yufeng Shen

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: hyperv: make sure input buffer is big enough
  HID: Bluetooth: hidp: make sure input buffers are big enough
  HID: hid-sensor-hub: quirk for STM Sensor hub
  HID: apple: add Apple wireless keyboard 2011 JIS model support
  HID: fix buffer allocations
  HID: multitouch: add FocalTech FTxxxx support
  HID: microsoft: Add ID's for Surface Type/Touch Cover 2
  HID: usbhid: quirk for CY-TM75 75 inch Touch Overlay

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

diff --cc drivers/hid/hid-ids.h
index 5a5248f2cc075b73ca68250866bddbc2b46f9bb1,00fd7452722f5a9336ec51c2c050a107031e90c9..22f28d6b33a845f0c728b3d4423b6c6fd848ff78
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -240,9 -241,8 +241,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_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