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

Merge branch 'omap-pool'

Conflicts:
	drivers/Makefile
---

a3307eaf1390bd5dbe36de6116a1ce73a4c61cfa