diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-02 14:22:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-02 14:22:15 -0700 |
| commit | f9ed432c929f005110c23eb00702265fc4c08e66 (patch) | |
| tree | 060e6787d0fe75c3a65827aaa9d51620cc3b6df7 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge tag 'please-pull-fix-mce-regression' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras (diff) | |
| parent | Merge branches 'for-3.11/upstream-fixes' and 'for-3.11/logitech-enumeration-fix' into for-linus (diff) | |
| download | wireguard-linux-f9ed432c929f005110c23eb00702265fc4c08e66.tar.xz wireguard-linux-f9ed432c929f005110c23eb00702265fc4c08e66.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
- fix hid-sony PS3 sixaxxis breakage from Benjamin Tissories
- fix hidraw race condition from Yonghua Zheng
- fix/bandaid for rare device enumeration problems of Logitech Unifying
receivers from Nestor Lopez Casado
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: hidraw: fix improper mutex release
HID: sony: fix HID mapping for PS3 sixaxis controller
HID: hid-logitech-dj: querying_devices was never set
HID: Revert "Revert "HID: Fix logitech-dj: missing Unifying device issue""
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions