From: Tony Lindgren <tony@atomide.com>
Date: Tue, 8 May 2012 17:18:17 +0000 (-0700)
Subject: Merge branch 'cleanup-soc' into cleanup
X-Git-Tag: omap-cleanup-for-v3.5~4
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=382ae00105d9989a821f458084e0428bce10b969;p=pandora-kernel.git

Merge branch 'cleanup-soc' into cleanup

Conflicts:
	arch/arm/mach-omap2/Makefile
---

382ae00105d9989a821f458084e0428bce10b969
Reading git-diff-tree failed