Merge branch 'devel-pmu' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 17 May 2010 16:21:23 +0000 (17:21 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 17 May 2010 16:21:23 +0000 (17:21 +0100)
1  2 
arch/arm/Kconfig

Simple merge