From: Tony Lindgren <tony@atomide.com>
Date: Wed, 17 Oct 2012 18:21:34 +0000 (-0700)
Subject: Merge branch 'omap-for-v3.8/cleanup-headers-dss' into omap-for-v3.8/cleanup-headers
X-Git-Tag: omap-for-v3.8/cleanup-headers-signed~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6832c95599e1a04f4b56b533718d1cda4689aec2;p=pandora-kernel.git

Merge branch 'omap-for-v3.8/cleanup-headers-dss' into omap-for-v3.8/cleanup-headers

Conflicts:
	arch/arm/mach-omap2/board-omap3logic.c
	arch/arm/mach-omap2/gpmc.c
	drivers/media/platform/omap/omap_vout.c
	drivers/media/platform/omap/omap_vout_vrfb.c
---

6832c95599e1a04f4b56b533718d1cda4689aec2
Reading git-diff-tree failed