From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 29 Oct 2014 18:52:35 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v3.18-rc3~33
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7f474df0a7b7dadfc01ba778460a91f554ca1481;p=linux-2.6-block.git

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

Pull HID fixes from Jiri Kosina:
 - workarounds for a couple of misbehaving Elan Touchscreens, by Adel
   Gadllah
 - fix for TransducerSerialNumber field implementation, by Jason Gerecke
 - a couple of new HID usages (added by HUT), by Olivier Gay

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: input: Fix TransducerSerialNumber implementation
  HID: add keyboard input assist hid usages
  HID: usbhid: enable always-poll quirk for Elan Touchscreen 016f
  HID: usbhid: enable always-poll quirk for Elan Touchscreen 009b
---

7f474df0a7b7dadfc01ba778460a91f554ca1481