From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 15 Nov 2012 16:59:54 +0000 (+0100)
Subject: Merge branch 'omap/cleanup-prcm-part2' into next/dt
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~44^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cff9f37a1e7b2565f254b5ab40c3213cc0f823a1;p=pandora-kernel.git

Merge branch 'omap/cleanup-prcm-part2' into next/dt

This resolves a nontrivial conflict where the omap_prcm_restart
is removed in one branch but another use is added in another
branch.

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

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

cff9f37a1e7b2565f254b5ab40c3213cc0f823a1
Reading git-diff-tree failed