| commit | 4cafc4b8d7219b70e15f22e4a51b3ce847810caf | [log] [tgz] |
|---|---|---|
| author | Robert Richter <robert.richter@amd.com> | Mon Oct 25 16:58:34 2010 +0200 |
| committer | Robert Richter <robert.richter@amd.com> | Mon Oct 25 16:58:34 2010 +0200 |
| tree | 8051ea3f36f0682d08f47df8e35e14ca7eb7a5d7 | |
| parent | b47fad3bfb5940cc3e28a1c69716f6dc44e4b7e6 [diff] | |
| parent | dbd1e66e04558a582e673bc4a9cd933ce0228d93 [diff] |
Merge branch 'oprofile/core' into oprofile/x86 Conflicts: arch/x86/oprofile/op_model_amd.c Signed-off-by: Robert Richter <robert.richter@amd.com>