From: Paul Walmsley <paul@pwsan.com>
Date: Fri, 11 Mar 2011 05:43:05 +0000 (-0700)
Subject: Merge remote branch 'remotes/origin/hwmod_a_2.6.39' into tmp-integration-2.6.39-20110... 
X-Git-Tag: v2.6.39-rc1~432^2~10^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d403fe03070b541cc93cfa915f6e6c592cf231c;p=pandora-kernel.git

Merge remote branch 'remotes/origin/hwmod_a_2.6.39' into tmp-integration-2.6.39-20110310-024

Conflicts:
	arch/arm/mach-omap2/omap_hwmod_2430_data.c
	arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
	arch/arm/plat-omap/include/plat/omap_hwmod.h
---

2d403fe03070b541cc93cfa915f6e6c592cf231c
Reading git-diff-tree failed