Olof Johansson 54d69df584 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>

2012-10-04 20:17:25 -07:00

..

plat

Merge branch 'late/kirkwood' into late/soc

2012-10-04 20:17:25 -07:00