Merge branch 'oprofile/urgent' into oprofile/core
Robert Richter [Fri, 1 Oct 2010 06:54:17 +0000 (08:54 +0200)]
Conflicts:
arch/arm/oprofile/common.c

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

1  2 
arch/arm/oprofile/common.c

Simple merge