Merge branch 'perf/urgent' into perf/core, to resolve conflict

Browse source

Signed-off-by: Ingo Molnar <mingo@kernel.org>

...

This commit is contained in:

Ingo Molnar 2016-04-23 14:12:10 +02:00

parent 9243ae5b28 b303e7c15d

commit 65cbbd037b

176 changed files with 1301 additions and 940 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

tools/perf/util/intel-pt.c

View file