From: Tony Lindgren <tony@atomide.com>
Date: Wed, 7 Nov 2012 01:35:11 +0000 (-0800)
Subject: Merge branch 'omap-for-v3.8/cleanup-prcm' into omap-for-v3.8/tmp-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3ba64f613ba905d06f6bf8f0ec44beb53531f92;p=pandora-kernel.git

Merge branch 'omap-for-v3.8/cleanup-prcm' into omap-for-v3.8/tmp-merge

Conflicts:
	arch/arm/mach-omap2/cm33xx.c
---

b3ba64f613ba905d06f6bf8f0ec44beb53531f92
Reading git-diff-tree failed