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

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

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

a08572ae529b1e8de12393eeced661feae8fd44c
Reading git-diff-tree failed