| commit | ef70fcc0cd5d98f5e2df82c9e598b47f351d4f66 | [log] [tgz] |
|---|---|---|
| author | Robert Richter <robert.richter@amd.com> | Fri Oct 01 08:54:17 2010 +0200 |
| committer | Robert Richter <robert.richter@amd.com> | Fri Oct 01 08:54:17 2010 +0200 |
| tree | b801ba4d7ebb1155df68d530df49444ffa6252cc | |
| parent | 4cbe75be5c6ae86bdc7daec864eeb2dfd66f48bb [diff] | |
| parent | 98d943b02f6f1b57787ff1aa6f34d019a407e3ee [diff] |
Merge branch 'oprofile/urgent' into oprofile/core Conflicts: arch/arm/oprofile/common.c Signed-off-by: Robert Richter <robert.richter@amd.com>