tree c8a7c44beff93c040c76788ce2f6f4916281cbd8
parent 209431eff8afb928d72200c79153165c7d860ca0
parent ca125b5e31f5ada6844f57c5a8e7cd104d26c8fa
author Tony Lindgren <tony@atomide.com> 1427916269 -0700
committer Tony Lindgren <tony@atomide.com> 1427916269 -0700

Merge branch '4.0-rc1-prcm-cleanup-v6' of https://github.com/t-kristo/linux-pm into omap-for-v4.1/prcm-cleanup

Conflicts:
	arch/arm/boot/dts/dra7.dtsi