From: Olof Johansson Date: Wed, 19 Apr 2017 14:02:50 +0000 (-0700) Subject: Merge tag 'hisi-armv7-soc-for-4.12' of git://github.com/hisilicon/linux-hisi into... X-Git-Tag: v4.13~772^2~2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d7718c147a89783ec3bf1735f724ca32174393dd;p=mirror_ubuntu-bionic-kernel.git Merge tag 'hisi-armv7-soc-for-4.12' of git://github.com/hisilicon/linux-hisi into next/soc ARM: mach-hisi: Hisilicon SoC updates for 4.12 - Fix the error return code in hip04_smp_init * tag 'hisi-armv7-soc-for-4.12' of git://github.com/hisilicon/linux-hisi: ARM: hisi: fix error return code in hip04_smp_init() Signed-off-by: Olof Johansson --- d7718c147a89783ec3bf1735f724ca32174393dd