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)
commitfda0e18c8a7a3e02747c2b045b4fcd2c920410b9
tree6dac80c846592901cbfdcff029525d7994465282
parent98830bc9967b18d6f9a614a1f354f5580196ef85
parentd1e86d64bc48dedd0d68d182d0ce6951d8b4fd0d
Merge branch 'devel-pmu' into devel
arch/arm/Kconfig