From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 19 Feb 2014 00:29:46 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~10798
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=525b870974802a5b72a81a4c7dbf9a706a659b46;p=mirror_ubuntu-artful-kernel.git

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
---

525b870974802a5b72a81a4c7dbf9a706a659b46
diff --cc drivers/hid/hid-ids.h
index 5a5248f2cc07,00fd7452722f..22f28d6b33a8
--- a/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