| commit | 54d69df5849ec2e660aa12ac75562618c10fb499 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Thu Oct 04 20:17:25 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Thu Oct 04 20:17:25 2012 -0700 |
| tree | adbfb8bcc7cc73b83bf2b784fa331911ba03573a | |
| parent | ad932bb6b549722a561fb31ac2fa50dcbcb3e36b [diff] | |
| parent | 46f2007c1efadfa4071c17e75f140c47f09293de [diff] |
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>