Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent

Browse source

...

This commit is contained in:

Ingo Molnar 2011-03-29 09:32:28 +02:00

parent 6c6804fb2c 914a76ca5e

commit 1dfd7b494b

2 changed files with 6 additions and 0 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

5

arch/x86/oprofile/nmi_int.c

View file

1

arch/x86/oprofile/op_counter.h

View file