Merge branch 'oprofile/urgent' (early part) into oprofile/perf
Robert Richter [Mon, 11 Oct 2010 17:26:50 +0000 (19:26 +0200)]
1  2 
arch/arm/kernel/perf_event.c
kernel/perf_event.c

Simple merge
Simple merge