]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e34c405 cc60fbc)
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)
commit6f5894dfb07cba322c4c25f58e89874073b188b0
tree3285fcdc17b2275555ad28747364eae6c4aa2e11tree | snapshot
parente34c405987b52a0e76e47eb6ebea7de22cf85be3commit | diff
parentcc60fbce5ae304443f86f49dd698fcd26356792ccommit | 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>
Linux Kernel Source Tree.