From: Tony Lindgren <tony@atomide.com>
Date: Fri, 3 Apr 2009 23:33:04 +0000 (-0700)
Subject: Merge branch 'omap-pool'
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=cc5c842355cbbc85153b3db3571cad0d32991c8b;p=linux-2.6-omap-h63xx.git

Merge branch 'omap-pool'

Conflicts:
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-rx51.c
---

cc5c842355cbbc85153b3db3571cad0d32991c8b