From: Tony Lindgren <tony@atomide.com>
Date: Tue, 18 Jun 2013 11:54:29 +0000 (-0700)
Subject: Merge branch 'omap-for-v3.11/pm-voltdomain' into omap-for-v3.11/tmp-merge
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=180b513ee6de143ebf656f07f8a5558bda82163d;p=pandora-kernel.git

Merge branch 'omap-for-v3.11/pm-voltdomain' into omap-for-v3.11/tmp-merge

Conflicts:
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/io.c
---

180b513ee6de143ebf656f07f8a5558bda82163d
Reading git-diff-tree failed