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
This commit is contained in:
Tony Lindgren 2015-04-01 12:24:29 -07:00
commit 2129536836
66 changed files with 1612 additions and 800 deletions