Merge branch 'oprofile/core' into oprofile/x86
authorRobert Richter <robert.richter@amd.com>
Mon, 25 Oct 2010 14:58:34 +0000 (16:58 +0200)
committerRobert Richter <robert.richter@amd.com>
Mon, 25 Oct 2010 14:58:34 +0000 (16:58 +0200)
commit4cafc4b8d7219b70e15f22e4a51b3ce847810caf
tree8051ea3f36f0682d08f47df8e35e14ca7eb7a5d7
parentb47fad3bfb5940cc3e28a1c69716f6dc44e4b7e6
parentdbd1e66e04558a582e673bc4a9cd933ce0228d93
Merge branch 'oprofile/core' into oprofile/x86

Conflicts:
arch/x86/oprofile/op_model_amd.c

Signed-off-by: Robert Richter <robert.richter@amd.com>
arch/x86/oprofile/op_model_amd.c