Merge branches 'perf/event-nos', 'perf/omap4' and 'perf/updates' into for-next/perf

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

Fri, 2 Dec 2011 15:28:39 +0000 (15:28 +0000)

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

Fri, 2 Dec 2011 15:28:39 +0000 (15:28 +0000)
author Will Deacon <will.deacon@arm.com>
Fri, 2 Dec 2011 15:28:39 +0000 (15:28 +0000)
committer Will Deacon <will.deacon@arm.com>
Fri, 2 Dec 2011 15:28:39 +0000 (15:28 +0000)
diff --cc arch/arm/kernel/perf_event.c
Simple merge
author	Will Deacon <will.deacon@arm.com>
	Fri, 2 Dec 2011 15:28:39 +0000 (15:28 +0000)
committer	Will Deacon <will.deacon@arm.com>
	Fri, 2 Dec 2011 15:28:39 +0000 (15:28 +0000)