Merge branch 'late/kirkwood' into late/soc

Merge in the late Kirkwood branch with the OMAP late branch for upstream
submission.

Final contents described in shared tag.

Fixup remove/change conflicts in arch/arm/mach-omap2/devices.c and
drivers/spi/spi-omap2-mcspi.c.

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/mach-omap1/devices.c
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 016429d89bb0bdb3692a54c918ab3e96c0fbec30,94b38af17055aaa879df5a677f17bae83e550bbf..285777241d5a75d1202480781317556338fcd45b
--- 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
@@@ -20,16 -20,15 +20,16 @@@
  #include <plat/omap_hwmod.h>
  #include <plat/dma.h>
  #include <plat/serial.h>
- #include <plat/l3_3xxx.h>
- #include <plat/l4_3xxx.h>
+ #include "l3_3xxx.h"
+ #include "l4_3xxx.h"
  #include <plat/i2c.h>
  #include <plat/mmc.h>
- #include <plat/mcbsp.h>
- #include <plat/mcspi.h>
+ #include <linux/platform_data/asoc-ti-mcbsp.h>
+ #include <linux/platform_data/spi-omap2-mcspi.h>
  #include <plat/dmtimer.h>
 +#include <plat/iommu.h>
  
- #include <mach/am35xx.h>
+ #include "am35xx.h"
  
  #include "soc.h"
  #include "omap_hwmod_common_data.h"

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

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

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

diff --cc arch/arm/plat-omap/omap_device.c
Simple merge

diff --cc drivers/spi/spi-omap2-mcspi.c
index b5d6994c8ba363186916fbfc93b7f25027a8c474,b9b7ad02ef4c416c725497aba18cca3380f513ae..d3d62f1e894c46789ccbaded79230f5e5d532069
--- 1/drivers/spi/spi-omap2-mcspi.c
--- 2/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@@ -41,7 -41,8 +41,7 @@@
  
  #include <linux/spi/spi.h>
  
- #include <plat/mcspi.h>
 -#include <plat/clock.h>
+ #include <linux/platform_data/spi-omap2-mcspi.h>
  
  #define OMAP2_MCSPI_MAX_FREQ          48000000
  #define SPI_AUTOSUSPEND_TIMEOUT               2000