]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
projects / mirror_ubuntu-kernels.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 380e99f e9a09ae)
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)
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

1  2 
drivers/hid/hid-ids.h patch | diff1 | diff2 | blob | history

diff --cc drivers/hid/hid-ids.h
Simple merge
Ubuntu combined Linux kernel mirror