Merge branch 'late/kirkwood' into late/soc
authorOlof Johansson <olof@lixom.net>
Fri, 5 Oct 2012 03:17:25 +0000 (20:17 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 5 Oct 2012 03:17:25 +0000 (20:17 -0700)
commit54d69df5849ec2e660aa12ac75562618c10fb499
treeadbfb8bcc7cc73b83bf2b784fa331911ba03573a
parentad932bb6b549722a561fb31ac2fa50dcbcb3e36b
parent46f2007c1efadfa4071c17e75f140c47f09293de
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>
17 files changed:
arch/arm/mach-omap1/devices.c
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/control.h
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod_2420_data.c
arch/arm/mach-omap2/omap_hwmod_2430_data.c
arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/plat-omap/include/plat/omap_device.h
arch/arm/plat-omap/include/plat/omap_hwmod.h
arch/arm/plat-omap/omap_device.c
drivers/spi/spi-omap2-mcspi.c