diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2016-07-28 04:49:23 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2016-07-28 04:49:23 -0400 |
| commit | 8c2f421c1f0fa7768767ecaad497aa676fc9015a (patch) | |
| tree | c4e2ed4855fdc0dcbc038f6198f0330f3c9c3fdf /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | e82a82c19f4272ea5437cc76e5711b98e2ee6223 (diff) | |
| parent | f4c109b660fa1d0453a6dde75bef725304687832 (diff) | |
Merge branch 'for-4.8/hid-led' into for-linus
Conflicts:
drivers/hid/hid-thingm.c
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions