From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 31 Oct 2011 22:17:39 +0000 (+0100)
Subject: Merge branch 'depends/omap2_dss' into next/cleanup
X-Git-Tag: v3.2-rc1~98^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=034ee299122c6b145d6d3cafb9ef5c329a4ab990;p=pandora-kernel.git

Merge branch 'depends/omap2_dss' into next/cleanup

Omap cleanups conflicted with omap2_dss work in a nontrivial
way, this is the most logical fixup.

Conflicts:
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-apollon.c
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-ldp.c
	arch/arm/mach-omap2/board-rx51.c

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

034ee299122c6b145d6d3cafb9ef5c329a4ab990
Reading git-diff-tree failed