Merge branch 'pmu-for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 19 Feb 2011 09:44:55 +0000 (09:44 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 19 Feb 2011 09:44:55 +0000 (09:44 +0000)
1  2 
arch/arm/kernel/perf_event.c

Simple merge