From: Tony Lindgren <tony@atomide.com>
Date: Fri, 9 Nov 2012 23:22:58 +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=d2bc27f41d054194776b736b6ecee09b9f1feaa5;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
	arch/arm/mach-omap2/io.c
	arch/arm/mach-omap2/prm_common.c
---

d2bc27f41d054194776b736b6ecee09b9f1feaa5
Reading git-diff-tree failed