tree acb642edcb5dbba6725da02bf70b204d20d75b41
parent 92556e60394a78c2c0d6958602271676094858bc
parent 3179e8e684603645b573fdc46139473d5ee4b189
author Linus Torvalds <torvalds@linux-foundation.org> 1404763983 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1404763983 -0700

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