diff options
| author | Ingo Molnar <[email protected]> | 2016-05-05 09:56:10 +0200 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2016-05-05 09:56:10 +0200 |
| commit | 3cd0b53553ce28da6fc828c601041c974e1c4dde (patch) | |
| tree | eb05932753a4afb9d3c82949ef056085f79be1b5 /tools/perf/util/trace-event-scripting.c | |
| parent | f68376fc9e6dc15a08e16f08c95e503f19ad8e34 (diff) | |
| parent | 08914f436bdd2ed60923f49cbc402307aba20fe4 (diff) | |
Merge branch 'x86/urgent' into x86/platform, to resolve conflict
Conflicts:
arch/x86/kernel/apic/x2apic_uv_x.c
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'tools/perf/util/trace-event-scripting.c')
0 files changed, 0 insertions, 0 deletions