]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitb0ef1f55c91e8a08d23300a47558728d061d6400
tree9c97f4d650a975c604e472ba0651c143ad7d3224
parent805ae95819e0a1cbb2cdf424fe933b1b6a527263
parentfdb0a99414d8b17640d62d811ef74cac4b1e348a
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/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