Merge branch 'next/soc' into for-next

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

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

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

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

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

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

diff --cc arch/arm/mach-omap2/board-omap3beagle.c
index 47507564240120fc4ea980dc41cf46a6984fcaa4,67769ef6d184d27918fda84bd22281ae1c114be0..fededfadd2ad2f43a8fb8fcf68e6385a18bb2ccf
--- 1/arch/arm/mach-omap2/board-omap3beagle.c
--- 2/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@@ -448,10 -428,9 +448,10 @@@ static struct platform_device *omap3_be
        &leds_gpio,
        &keys_gpio,
        &madc_hwmon,
 +      &leds_pwm,
  };
  
- static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
+ static struct usbhs_omap_platform_data usbhs_bdata __initdata = {
  
        .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED,
        .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,

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

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