From: Olof Johansson <olof@lixom.net>
Date: Fri, 14 Dec 2012 21:16:07 +0000 (-0800)
Subject: ARM: arm-soc: Merge branch 'next/smp' into next/soc2
X-Git-Tag: firefly_0821_release~3680^2~1449^2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=c91321e8ff338a88a9272dcd938f085955cd5846;p=firefly-linux-kernel-4.4.55.git

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>
---

c91321e8ff338a88a9272dcd938f085955cd5846