Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Jul 2012 15:15:55 +0000 (08:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Jul 2012 15:15:55 +0000 (08:15 -0700)
commit61c901c56905256a4a4d7c2af92d66200a2ee7f2
tree9c97f4d650a975c604e472ba0651c143ad7d3224
parent380e99fc44d79bc35af9ff1d3316ef4027ce775e
parente9a09aed3eff8b1706e4bc24e8b3b16283797353
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/jikos/hid

Pull HID update from Jiri Kosina:
 "A final round of changes for HID for 3.5: just device ID additions."

* 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: hid-multitouch: add support for Zytronic panels
  HID: add Sennheiser BTD500USB device support
  HID: add battery quirk for Apple Wireless ANSI
drivers/hid/hid-ids.h