tree 597fe4f90c49f784a0dbf1596c027880747210ec
parent b0a37dca72a05b7b579f288d8a67afeed96bffa5
parent 8fb54284ba6aa1f0d832ec015fde64ecf4bb0f4f
author Russell King <rmk+kernel@arm.linux.org.uk> 1317026196 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1317026196 +0100

Merge branch 'for_3_2/for-rmk/arm_cpu_pm' of git://gitorious.org/omap-sw-develoment/linux-omap-dev into devel-stable