| commit | 1241eb8f136bf3ea409f61590e7663465906d158 | [log] [tgz] |
|---|---|---|
| author | Robert Richter <robert.richter@amd.com> | Fri Jun 12 17:58:48 2009 +0200 |
| committer | Robert Richter <robert.richter@amd.com> | Fri Jun 12 17:58:48 2009 +0200 |
| tree | c8384237f19bb1094d9c90825a74e28393b60d00 | |
| parent | 51563a0e5650d0d76539625388d72d62b34c726e [diff] | |
| parent | 940010c5a314a7bd9b498593bc6ba1718ac5aec5 [diff] |
Merge commit 'tip/perfcounters-for-linus' into oprofile/master Conflicts: arch/x86/oprofile/op_model_ppro.c Signed-off-by: Robert Richter <robert.richter@amd.com>