From: Tony Lindgren <tony@atomide.com>
Date: Fri, 11 May 2012 18:59:45 +0000 (-0700)
Subject: Merge tag 'omap-fixes-for-cleanup-for-v3.5' into tmp-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca98f7006e6a780580c96e062418b9be3d02478a;p=pandora-kernel.git

Merge tag 'omap-fixes-for-cleanup-for-v3.5' into tmp-merge

Turns out the earlier omap-cleanup-sparse-for-v3.5
up introduced one compile issue and a new warning.

Conflicts:
	arch/arm/mach-omap1/common.h
---

ca98f7006e6a780580c96e062418b9be3d02478a
Reading git-diff-tree failed