From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Sep 2012 19:29:38 +0000 (-0700)
Subject: Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v3.12-rc1~2446
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5b6e7f1c169db10632459c28f148011e039187bd;p=kernel%2Fkernel-generic.git

Merge branch 'upstream-fixes' of git://git./linux/kernel/git/jikos/hid

Pull HID updates from Jiri Kosina:
 "It contains a fix for Eaton Ellipse MAX UPS from Alan Stern,
  performance improvement (not processing debug data if noone is
  interested), by Henrik Rydberg, and allowing tpkbd-driven devices to
  work even with generic driver in a crippled mode, by Andres Freund."

* 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: tpkbd: work even if the new Lenovo Keyboard driver is not configured
  HID: Only dump input if someone is listening
  HID: add NOGET quirk for Eaton Ellipse MAX UPS
---

5b6e7f1c169db10632459c28f148011e039187bd