From: Tony Lindgren <tony@atomide.com>
Date: Tue, 5 Oct 2010 01:39:04 +0000 (-0700)
Subject: Merge branch 'omap_sparse_fixesv2' of git://dev.omapzoom.org/pub/scm/manju/kernel... 
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7526f1dff19ad4b6778a4304a35a86a9eb7d0eb3;p=pandora-kernel.git

Merge branch 'omap_sparse_fixesv2' of git://dev.omapzoom.org/manju/kernel-omap3-dev into omap-for-linus

Conflicts:
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-omap4panda.c
	arch/arm/mach-omap2/control.c
	arch/arm/plat-omap/sram.c
---

7526f1dff19ad4b6778a4304a35a86a9eb7d0eb3
Reading git-diff-tree failed