From: Tony Lindgren <tony@atomide.com>
Date: Thu, 6 Oct 2011 02:09:23 +0000 (-0700)
Subject: Merge branch 'sram-map-io' into dt-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3df5c1de85cd7a7830da42b5e9467d58c081a511;p=pandora-kernel.git

Merge branch 'sram-map-io' into dt-merge

Conflicts:
	arch/arm/mach-omap1/board-ams-delta.c
	arch/arm/mach-omap1/board-generic.c
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap1/board-h3.c
	arch/arm/mach-omap1/board-nokia770.c
	arch/arm/mach-omap1/board-osk.c
	arch/arm/mach-omap1/board-palmte.c
	arch/arm/mach-omap1/board-palmtt.c
	arch/arm/mach-omap1/board-palmz71.c
	arch/arm/mach-omap1/board-sx1.c
	arch/arm/mach-omap1/board-voiceblue.c
---

3df5c1de85cd7a7830da42b5e9467d58c081a511
Reading git-diff-tree failed