Merge branch 'oprofile/x86-oprofile-for-tip' into oprofile/oprofile-for-tip

Browse source

Conflicts:
	arch/x86/oprofile/op_model_ppro.c

...

This commit is contained in:

Robert Richter 2008-10-15 22:19:41 +02:00

parent 5f87dfb79f 59512900ba

commit 5a289395bf

3 changed files with 108 additions and 35 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

26

arch/x86/oprofile/nmi_int.c

View file

108

arch/x86/oprofile/op_model_ppro.c

View file

9

arch/x86/oprofile/op_x86_model.h

View file