| commit | b971f06187d83b5c03d2b597cccdfef421c0ca91 | [log] [tgz] |
|---|---|---|
| author | Robert Richter <robert.richter@amd.com> | Fri Apr 23 16:47:51 2010 +0200 |
| committer | Robert Richter <robert.richter@amd.com> | Fri Apr 23 16:47:51 2010 +0200 |
| tree | 849dbe485ca9472bea002f94681882ce103fe3cd | |
| parent | cb6e943ccf19ab6d3189147e9d625a992e016084 [diff] | |
| parent | c1ab9cab75098924fa8226a8a371de66977439df [diff] |
Merge commit 'tip/tracing/core' into oprofile/core Conflicts: drivers/oprofile/cpu_buffer.c Signed-off-by: Robert Richter <robert.richter@amd.com>