Merge branches 'perf/fixes', 'perf/event-nos', 'perf/omap4' and 'perf/updates' into...

author Will Deacon <will.deacon@arm.com>

Tue, 22 Nov 2011 18:05:21 +0000 (18:05 +0000)

committer Will Deacon <will.deacon@arm.com>

Tue, 22 Nov 2011 18:05:21 +0000 (18:05 +0000)
author Will Deacon <will.deacon@arm.com>
Tue, 22 Nov 2011 18:05:21 +0000 (18:05 +0000)
committer Will Deacon <will.deacon@arm.com>
Tue, 22 Nov 2011 18:05:21 +0000 (18:05 +0000)
diff --cc arch/arm/include/asm/pmu.h
Simple merge
diff --cc arch/arm/kernel/perf_event.c
Simple merge
author	Will Deacon <will.deacon@arm.com>
	Tue, 22 Nov 2011 18:05:21 +0000 (18:05 +0000)
committer	Will Deacon <will.deacon@arm.com>
	Tue, 22 Nov 2011 18:05:21 +0000 (18:05 +0000)
		1	2	3	4
arch/arm/include/asm/pmu.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/arm/kernel/perf_event.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history