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

Merge branch 'omap-pool'

Conflicts:
	drivers/Makefile
	drivers/mmc/host/omap_hsmmc.c
---

f750b2eff6b75bbbbe0653c86f7bcb68d71f3df9