From: Tony Lindgren <tony@atomide.com>
Date: Thu, 25 Oct 2012 18:29:59 +0000 (-0700)
Subject: Merge branch 'omap-for-v3.8/cleanup-headers' into omap-for-v3.8/tmp-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d2b762a3712f996ca3f961715027146ed6ac5e0;p=pandora-kernel.git

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

Conflicts:
	arch/arm/mach-omap2/common-board-devices.c
	arch/arm/mach-omap2/common-board-devices.h
	arch/arm/mach-omap2/omap_hwmod_44xx_data.c
---

8d2b762a3712f996ca3f961715027146ed6ac5e0
Reading git-diff-tree failed