From: Tony Lindgren <tony@atomide.com>
Date: Fri, 9 Nov 2012 22:54:17 +0000 (-0800)
Subject: Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for... 
X-Git-Tag: omap-for-v3.8/dt-signed~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37;p=pandora-kernel.git

Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt

Conflicts:
	arch/arm/plat-omap/dmtimer.c

Resolved as suggested by Jon Hunter.
---

f56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37
Reading git-diff-tree failed