From: Tony Lindgren <tony@atomide.com>
Date: Thu, 3 Mar 2011 01:11:18 +0000 (-0800)
Subject: Merge branches 'devel-iommu-mailbox', 'devel-mcbsp', 'devel-board' and 'devel-hsmmc... 
X-Git-Tag: v2.6.39-rc1~432^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2833a0578453449dce1b8b8e54f67a544c5e37f;p=pandora-kernel.git

Merge branches 'devel-iommu-mailbox', 'devel-mcbsp', 'devel-board' and 'devel-hsmmc' into omap-for-linus

Conflicts:
	arch/arm/mach-omap2/omap_hwmod_44xx_data.c
---

b2833a0578453449dce1b8b8e54f67a544c5e37f
Reading git-diff-tree failed