Merge branch 'perf/urgent' into perf/core

Browse source

Conflicts:
	tools/perf/Makefile

Merge reason: resolve the conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

...

This commit is contained in:

Ingo Molnar 2010-04-03 18:17:55 +02:00

parent 70a7c1271e 6e03bb5ad3

commit 22a4e4c435

4 changed files with 18 additions and 14 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

arch/powerpc/kernel/misc.S

View file

3

kernel/perf_event.c

View file

10

tools/perf/Makefile

View file

17

tools/perf/util/scripting-engines/trace-event-python.c

View file