diff options
| author | Ingo Molnar <[email protected]> | 2019-03-28 09:56:32 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2019-03-28 09:58:28 +0000 |
| commit | cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb (patch) | |
| tree | 52591d7b53600d5d39369525a356ccb81e22fcd9 /tools/perf/scripts/python/intel-pt-events.py | |
| parent | proc/kcore: Remove unused kclist_add_remap() (diff) | |
| parent | Linux 5.1-rc2 (diff) | |
| download | kernel-cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb.tar.gz kernel-cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb.zip | |
Merge tag 'v5.1-rc2' into core/urgent, to resolve a conflict
Conflicts:
include/linux/kcore.h
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/intel-pt-events.py')
0 files changed, 0 insertions, 0 deletions