diff options
author | 2013-06-23 16:12:46 -1000 | |
---|---|---|
committer | 2013-06-23 16:12:46 -1000 | |
commit | e941bc0dd787cd79da3aa7cf1fe0bc1eca6c0b2d (patch) | |
tree | 83386b43591bd152352c5f967829c89cb9de85da /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Linux 3.10-rc7 (diff) | |
parent | Input: xpad - fix for "Mad Catz Street Fighter IV FightPad" controllers (diff) | |
download | wireguard-linux-e941bc0dd787cd79da3aa7cf1fe0bc1eca6c0b2d.tar.xz wireguard-linux-e941bc0dd787cd79da3aa7cf1fe0bc1eca6c0b2d.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input subsystem updates from Dmitry Torokhov:
"A few small fixups for cyttsp, wacom and xpad drivers"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: xpad - fix for "Mad Catz Street Fighter IV FightPad" controllers
Input: wacom - add a new stylus (0x100802) for Intuos5 and Cintiqs
Input: add missing dependencies on CONFIG_HAS_IOMEM
Input: cyttsp - fix swapped mfg_stat and mfg_cmd registers
Input: cyttsp - add missing handshake
Input: cyttsp - fix memcpy size param
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions