tree 3285fcdc17b2275555ad28747364eae6c4aa2e11
parent 1f1ba836455b94494aaee9381ed9197ade2f770f
parent 9560f840f301868b4b4b175e81afa96dc57611ac
author Olof Johansson <olof@lixom.net> 1355519767 -0800
committer Olof Johansson <olof@lixom.net> 1355519821 -0800

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>