Merge branch 'oprofile/perf' into oprofile/core
authorRobert Richter <robert.richter@amd.com>
Mon, 11 Oct 2010 17:38:39 +0000 (19:38 +0200)
committerRobert Richter <robert.richter@amd.com>
Mon, 11 Oct 2010 17:38:39 +0000 (19:38 +0200)
commit0361e02342f60b64a7075755d5851ed4e6f98c7d
tree76ca78323ad1d4b1ecf1e8137f6b48eddcbebe3a
parent4fdaa7b682b413dfb7ca9fa74ff45b1e0cb3dade
parente9677b3ce207a07fad5746b6f7ddc70cae79de0a
Merge branch 'oprofile/perf' into oprofile/core

Conflicts:
arch/arm/oprofile/common.c

Signed-off-by: Robert Richter <robert.richter@amd.com>