diff options
author | 2012-07-19 08:15:55 -0700 | |
---|---|---|
committer | 2012-07-19 08:15:55 -0700 | |
commit | 61c901c56905256a4a4d7c2af92d66200a2ee7f2 (patch) | |
tree | 9c97f4d650a975c604e472ba0651c143ad7d3224 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | cx25821: Remove bad strcpy to read-only char* (diff) | |
parent | HID: hid-multitouch: add support for Zytronic panels (diff) | |
download | wireguard-linux-61c901c56905256a4a4d7c2af92d66200a2ee7f2.tar.xz wireguard-linux-61c901c56905256a4a4d7c2af92d66200a2ee7f2.zip |
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
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions