diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-22 09:18:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-22 09:18:06 -0800 |
| commit | 866d43c9ea88daa3751b58aba16a2a9b7f7aa067 (patch) | |
| tree | 063f29321d4ab3233a671dbb77b01d2f3773d372 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge git://www.linux-watchdog.org/linux-watchdog (diff) | |
| parent | Input: ams_delta_serio - include linux/module.h (diff) | |
| download | wireguard-linux-866d43c9ea88daa3751b58aba16a2a9b7f7aa067.tar.xz wireguard-linux-866d43c9ea88daa3751b58aba16a2a9b7f7aa067.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: ams_delta_serio - include linux/module.h
Input: elantech - adjust hw_version detection logic
Input: i8042 - add HP Pavilion dv4s to 'notimeout' and 'nomux' blacklists
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions