| commit | 61c901c56905256a4a4d7c2af92d66200a2ee7f2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jul 19 08:15:55 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jul 19 08:15:55 2012 -0700 |
| tree | 9c97f4d650a975c604e472ba0651c143ad7d3224 | |
| parent | 380e99fc44d79bc35af9ff1d3316ef4027ce775e [diff] | |
| parent | e9a09aed3eff8b1706e4bc24e8b3b16283797353 [diff] |
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