Merge branch 'perf/urgent' into perf/core

Browse source

Conflicts:
	tools/perf/util/callchain.h

Merge reason:
	Fix a non-trivial conflict with latest fixes

...

This commit is contained in:

Frederic Weisbecker 2010-08-27 02:28:40 +02:00

parent 7de5d895b2 5225c45899

commit 98ee74a75c

3 changed files with 4 additions and 1 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

kernel/trace/trace_stack.c

View file