From: Tony Lindgren <tony@atomide.com>
Date: Wed, 7 Nov 2012 01:33:31 +0000 (-0800)
Subject: Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for... 
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24c06f234339ef37d5bbf092f7678e1041deb35b;p=pandora-kernel.git

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

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

24c06f234339ef37d5bbf092f7678e1041deb35b
Reading git-diff-tree failed