Merge branch 'cleanup-hwmod' into cleanup

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

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

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

diff --cc arch/arm/mach-omap2/dsp.c
index 88ffa1e,8b251a9..a636ebc
--- 1/arch/arm/mach-omap2/dsp.c
--- 2/arch/arm/mach-omap2/dsp.c
+++ b/arch/arm/mach-omap2/dsp.c
@@@ -20,9 -20,7 +20,10 @@@
  
  #include <linux/module.h>
  #include <linux/platform_device.h>
 +
 +#include <asm/memblock.h>
 +
+ #include "control.h"
  #include "cm2xxx_3xxx.h"
  #include "prm2xxx_3xxx.h"
  #ifdef CONFIG_BRIDGE_DVFS

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

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