git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad932bb 46f2007)
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)
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>

Trivial merge
Pandora Kernel Repository