| commit | 652953b72eea8b9d1bd6b9f67b796c6722bada3a | [log] [tgz] |
|---|---|---|
| author | Robert Richter <robert.richter@amd.com> | Mon Oct 11 19:33:42 2010 +0200 |
| committer | Robert Richter <robert.richter@amd.com> | Mon Oct 11 19:33:42 2010 +0200 |
| tree | 1620d9c090d8e0c2c65a0c36b632debaef80c484 | |
| parent | 81771974ae49bf79aab60c42eac7a6d730a9ef2b [diff] | |
| parent | 5140434d5f82f2e2119926272ada2e9731ec04f1 [diff] |
Merge branch 'oprofile/core' (early part) into oprofile/perf Conflicts: arch/arm/oprofile/common.c Signed-off-by: Robert Richter <robert.richter@amd.com>