From: Tony Lindgren <tony@atomide.com>
Date: Fri, 30 Oct 2009 18:50:00 +0000 (-0700)
Subject: Merge branch '7xx-iosplit-plat' with omap-fixes
X-Git-Tag: v2.6.32-omap1~11^2^2~1^2^2^2^2^2~11^2~9
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b460a6f0cb7bbcd601ffee5b20b81ebce42e98a;p=pandora-kernel.git

Merge branch '7xx-iosplit-plat' with omap-fixes

Conflicts:
	arch/arm/mach-omap1/serial.c
	arch/arm/mach-omap2/board-3430sdp.c
	arch/arm/mach-omap2/board-ldp.c
	arch/arm/mach-omap2/board-omap3evm.c
	arch/arm/mach-omap2/board-omap3pandora.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mach-omap2/board-rx51.c
	arch/arm/mach-omap2/board-zoom2.c
---

2b460a6f0cb7bbcd601ffee5b20b81ebce42e98a
Reading git-diff-tree failed