Merge branch 'oprofile/urgent' into HEAD

Browse source

...

This commit is contained in:

Robert Richter 2011-06-15 14:37:35 +02:00

parent 5f307491f3 a0e3e70243

commit a406ab6d77

2 changed files with 57 additions and 13 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

56

arch/x86/oprofile/backtrace.c

View file

14

arch/x86/oprofile/nmi_int.c

View file