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)
Conflicts:
arch/x86/oprofile/op_model_ppro.c


Trivial merge