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

Merge branch 'omap-fixes'

Conflicts:
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-rx51.c
	drivers/mmc/host/omap_hsmmc.c
---

2d9aaa76288b9a4d6aca5067154ceb09122aacd8