Merge branch 'for_3_2/for-rmk/arm_cpu_pm' of git://gitorious.org/omap-sw-develoment...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 26 Sep 2011 08:36:36 +0000 (09:36 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 26 Sep 2011 08:36:36 +0000 (09:36 +0100)
1  2 
arch/arm/Kconfig

Simple merge