Merge branch 'perf-split' of git://linux-arm.org/linux-2.6-wd into devel-stable

f1690d17 · Russell King · 612275ad · 43eab878 · f1690d17 · f1690d17
Commit f1690d17 authored Nov 26, 2010 by Russell King
4 changed files
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
--- a/arch/arm/kernel/perf_event_v6.c
+++ b/arch/arm/kernel/perf_event_v6.c
--- a/arch/arm/kernel/perf_event_v7.c
+++ b/arch/arm/kernel/perf_event_v7.c
--- a/arch/arm/kernel/perf_event_xscale.c
+++ b/arch/arm/kernel/perf_event_xscale.c