Merge remote branch 'remotes/origin/voltage_split_2.6.39' into tmp-integration-2...

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

diff --cc arch/arm/mach-omap2/Makefile
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 17b4fb8c3479c0a44b0646ced9104477dd396c14,8de2de97c2a18359042f45d775cb9f8d3274e44c..c819c306693a2b69dcd62e0f56c210bf6e6bb744
--- 1/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
--- 2/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/smartreflex.h>
 +#include <plat/mmc.h>
 +#include <plat/mcbsp.h>
  #include <plat/mcspi.h>
 +#include <plat/dmtimer.h>
  
  #include "omap_hwmod_common_data.h"
  

diff --cc arch/arm/mach-omap2/smartreflex.c
Simple merge

diff --cc arch/arm/plat-omap/include/plat/omap_hwmod.h
Simple merge