From: Tony Lindgren <tony@atomide.com>
Date: Mon, 29 Sep 2014 18:37:35 +0000 (-0700)
Subject: Merge remote-tracking branch 'tero/for-v3.18/prcm-cleanup-v2' into omap-for-v3.17... 
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd6358a4671d5ad57fa57da310203ecec1fb552f;p=pandora-kernel.git

Merge remote-tracking branch 'tero/for-v3.18/prcm-cleanup-v2' into omap-for-v3.17/prcm-v2

Conflicts:
	arch/arm/mach-omap2/omap_hwmod.c
	arch/arm/mach-omap2/prm3xxx.c
---

bd6358a4671d5ad57fa57da310203ecec1fb552f
Reading git-diff-tree failed