Merge branch '4.0-rc1-prcm-cleanup-v6' of https://github.com/t-kristo/linux-pm into... omap-for-v4.1/prcm-dts
authorTony Lindgren <tony@atomide.com>
Wed, 1 Apr 2015 19:24:29 +0000 (12:24 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 1 Apr 2015 19:24:29 +0000 (12:24 -0700)
Conflicts:
arch/arm/boot/dts/dra7.dtsi


Trivial merge