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: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=a08572ae529b1e8de12393eeced661feae8fd44c;ds=sidebyside

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
diff --cc arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 17b4fb8c3479,8de2de97c2a1..c819c306693a
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@@ -22,11 -22,7 +22,10 @@@
  #include <plat/l4_3xxx.h>
  #include <plat/i2c.h>
  #include <plat/gpio.h>
 +#include <plat/mmc.h>
- #include <plat/smartreflex.h>
 +#include <plat/mcbsp.h>
  #include <plat/mcspi.h>
 +#include <plat/dmtimer.h>
  
  #include "omap_hwmod_common_data.h"