Merge branch 'oprofile/core' (early part) into oprofile/perf

Browse source

Conflicts:
	arch/arm/oprofile/common.c

Signed-off-by: Robert Richter <robert.richter@amd.com>

...

This commit is contained in:

Robert Richter 2010-10-11 19:33:42 +02:00

parent 81771974ae 5140434d5f

commit 652953b72e

2 changed files with 60 additions and 19 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

70

arch/x86/oprofile/backtrace.c

View file

9

arch/x86/oprofile/nmi_int.c

View file