From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 7 Jul 2014 20:13:03 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v4.13~7090
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4c2f503aade27ebf12f5733a583d711f99dc5ec1;p=mirror_ubuntu-bionic-kernel.git

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

Pull HID fixes from Jiri Kosina:
 "A few tiny HID subsystem fixes for 3.16"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: use multi input quirk for 22b9:2968
  HID: sensor-hub: fix potential memory leak
  HID: usbhid: quirk for PM1610 and PM1640 Touchscreen.
  HID: rmi: Protect PM-only functions by #ifdef CONFIG_PM
  HID: sensor-hub: introduce Kconfig dependency on IOMEM
  HID: sensor-hub: make dyn_callback_lock IRQ-safe
---

4c2f503aade27ebf12f5733a583d711f99dc5ec1