projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1f1ba83 9560f84)
ARM: arm-soc: Merge branch 'next/smp' into next/soc2
authorOlof Johansson <olof@lixom.net>
Fri, 14 Dec 2012 21:16:07 +0000 (13:16 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 14 Dec 2012 21:17:01 +0000 (13:17 -0800)
commitc91321e8ff338a88a9272dcd938f085955cd5846
tree3285fcdc17b2275555ad28747364eae6c4aa2e11tree | snapshot
parent1f1ba836455b94494aaee9381ed9197ade2f770fcommit | diff
parent9560f840f301868b4b4b175e81afa96dc57611accommit | diff
ARM: arm-soc: Merge branch 'next/smp' into next/soc2

Merging in the smp-on-socfpga branch into soc2 since the topics are similar
and it's a short branch in the first place.

* next/smp:
  ARM: socfpga: mark secondary_trampoline as cpuinit
  socfpga: map uart into virtual address space so that early_printk() works
  ARM: socfpga: fix build break for allyesconfig
  ARM: socfpga: Enable SMP for socfpga

Signed-off-by: Olof Johansson <olof@lixom.net>
John Crispins staging tree