From: Tony Lindgren <tony@atomide.com>
Date: Thu, 25 Oct 2012 19:21:48 +0000 (-0700)
Subject: Merge branch 'omap-for-v3.8/cleanup-headers-menelaus' into omap-for-v3.8/cleanup... 
X-Git-Tag: omap-for-v3.8/cleanup-headers-part3-signed~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2da8a79f7d81853d00b6a00621aeef7545196084;p=pandora-kernel.git

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

Conflicts:
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-n8x0.c
---

2da8a79f7d81853d00b6a00621aeef7545196084
Reading git-diff-tree failed