Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/clock

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

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

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

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

diff --cc arch/arm/mach-omap2/control.h
Simple merge

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

diff --cc arch/arm/mach-omap2/omap_opp_data.h
Simple merge

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

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

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

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

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

diff --cc arch/arm/mach-omap2/voltagedomains44xx_data.c
index c3115f6,b893c8e..48b22a0
--- 1/arch/arm/mach-omap2/voltagedomains44xx_data.c
--- 2/arch/arm/mach-omap2/voltagedomains44xx_data.c
+++ b/arch/arm/mach-omap2/voltagedomains44xx_data.c
@@@ -22,7 -22,7 +22,7 @@@
  #include <linux/init.h>
  
  #include "common.h"
--
++#include "soc.h"
  #include "prm-regbits-44xx.h"
  #include "prm44xx.h"
  #include "prcm44xx.h"

diff --cc drivers/staging/tidspbridge/include/dspbridge/host_os.h
Simple merge

diff --cc drivers/usb/musb/musb_dsps.c
Simple merge