From: Olof Johansson Date: Wed, 21 Jan 2015 22:29:06 +0000 (-0800) Subject: Merge tag 'new-atlas7mach-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c1cd7adb3844d7e2e47533e485cc8bebb6725419;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge tag 'new-atlas7mach-for-3.20' of git://git./linux/kernel/git/baohua/linux into next/soc Merge "CSR new atlas7 machine, and delete old marco machine for 3.20" from Barry Song: drop CSR Marco machine and add Atlas7 new machine This is the init support for CSR Atlas7 new SoC. Old Marco has never shipped to customers and been dropped. * tag 'new-atlas7mach-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux: ARM: sirf: add Atlas7 machine support ARM: sirf: move to debug_ll_io_init and drop map_io ARM: sirf: move platsmp to support Atlas7 SoC ARM: sirf: drop Marco machine ARM: sirf: drop Marco support in reset controller module Signed-off-by: Olof Johansson --- c1cd7adb3844d7e2e47533e485cc8bebb6725419