From: Tony Lindgren <tony@atomide.com>
Date: Tue, 7 Apr 2009 23:36:16 +0000 (-0700)
Subject: Merge branch 'omap-fixes'
X-Git-Tag: v2.6.32-omap1~11^2^2~1^2^2^2^2^2~8^2^2~18^2~2^2^2~2^2^2^2^2~16^2^2~8^2^2~7^2~172
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d9aaa76288b9a4d6aca5067154ceb09122aacd8;p=pandora-kernel.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
Reading git-diff-tree failed