Merge branch 'oprofile/x86-oprofile-for-tip' into oprofile/oprofile-for-tip
authorRobert Richter <robert.richter@amd.com>
Wed, 15 Oct 2008 20:19:41 +0000 (22:19 +0200)
committerRobert Richter <robert.richter@amd.com>
Wed, 15 Oct 2008 20:19:41 +0000 (22:19 +0200)
commit5a289395bf753f8a318d3a5fa335a757c16c0183
tree3573b8bc4bbd135616bb395d998ef1526fff596f
parent5f87dfb79f829339508a5d989b8252eb30842587
parent59512900baab03c5629f2ff5efad1d5d4e682ece
Merge branch 'oprofile/x86-oprofile-for-tip' into oprofile/oprofile-for-tip

Conflicts:
arch/x86/oprofile/op_model_ppro.c
arch/x86/oprofile/nmi_int.c
arch/x86/oprofile/op_model_ppro.c
arch/x86/oprofile/op_x86_model.h