]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
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)
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>

Trivial merge