Merge branch 'oprofile/perf' into oprofile/core
Robert Richter [Mon, 11 Oct 2010 17:38:39 +0000 (19:38 +0200)]
Conflicts:
arch/arm/oprofile/common.c

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


Trivial merge