From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 20 Jun 2013 15:35:16 +0000 (+0200)
Subject: Merge branch 'omap/pm-voltdomain-cleanup' into next/soc
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~71^2~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aee9a50c5b9e424994a58b2aefaa499623e6786a;p=pandora-kernel.git

Merge branch 'omap/pm-voltdomain-cleanup' into next/soc

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

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

aee9a50c5b9e424994a58b2aefaa499623e6786a
Reading git-diff-tree failed