Merge branches 'perf/event-nos', 'perf/updates' and 'perf/omap4' into for-rmk
authorWill Deacon <will.deacon@arm.com>
Fri, 2 Dec 2011 15:22:18 +0000 (15:22 +0000)
committerWill Deacon <will.deacon@arm.com>
Fri, 2 Dec 2011 15:22:18 +0000 (15:22 +0000)
1  2  3 
arch/arm/kernel/perf_event.c

Simple merge