From: Tony Lindgren <tony@atomide.com>
Date: Wed, 1 Apr 2015 19:24:29 +0000 (-0700)
Subject: Merge branch '4.0-rc1-prcm-cleanup-v6' of https://github.com/t-kristo/linux-pm into... 
X-Git-Tag: omap-for-v4.1/prcm-dts^0
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21295368367beaa563b310d5492166dba158b884;p=pandora-kernel.git

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
---

21295368367beaa563b310d5492166dba158b884
Reading git-diff-tree failed