From: Tony Lindgren <tony@atomide.com>
Date: Mon, 26 Nov 2012 22:23:24 +0000 (-0800)
Subject: Merge tag 'omap-for-v3.8/cleanup-multiplatform-signed' into omap-for-v3.8/tmp-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6778a206df51747e3590fadec45dfe0ff2cc55e;p=pandora-kernel.git

Merge tag 'omap-for-v3.8/cleanup-multiplatform-signed' into omap-for-v3.8/tmp-merge

Remaining patches to allow omap2+ to build with multiplatform
enabled. Unfortunately the DMA header patch had to be redone
to avoid adding new multiplatform specific include paths, the
other patches are just trivial compile fixes.

Note that this does not yet contain the necessary Kconfig
changes as we are still waiting for some drivers to get
fixed up first.

Conflicts:
	arch/arm/mach-omap2/io.c
	arch/arm/mach-omap2/omap_hwmod_2420_data.c
	arch/arm/mach-omap2/omap_hwmod_2430_data.c
	arch/arm/mach-omap2/omap_hwmod_44xx_data.c
---

d6778a206df51747e3590fadec45dfe0ff2cc55e
Reading git-diff-tree failed