| commit | 5a289395bf753f8a318d3a5fa335a757c16c0183 | [log] [tgz] |
|---|---|---|
| author | Robert Richter <robert.richter@amd.com> | Wed Oct 15 22:19:41 2008 +0200 |
| committer | Robert Richter <robert.richter@amd.com> | Wed Oct 15 22:19:41 2008 +0200 |
| tree | 3573b8bc4bbd135616bb395d998ef1526fff596f | |
| parent | 5f87dfb79f829339508a5d989b8252eb30842587 [diff] | |
| parent | 59512900baab03c5629f2ff5efad1d5d4e682ece [diff] |
Merge branch 'oprofile/x86-oprofile-for-tip' into oprofile/oprofile-for-tip Conflicts: arch/x86/oprofile/op_model_ppro.c