tree 6c4032e0d57f3a0c41e07843217a199d9b8338ce
parent bf71d0e18ea94adade8c6cd5bd40beb83bef1565
parent aad932e75c573aec37a0652ff1c27a975d8d5373
author Linus Torvalds <torvalds@linux-foundation.org> 1347046178 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1347046178 -0700

Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/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