From: Arnd Bergmann Date: Sat, 26 Jul 2014 15:34:26 +0000 (+0200) Subject: Merge tag 'v3.17-rockchip-smp-hotplug' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: firefly_0821_release~176^2~3447^2~11 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=03eea7cda20128f97fa281650ada69fe19194d56;p=firefly-linux-kernel-4.4.55.git Merge tag 'v3.17-rockchip-smp-hotplug' of git://git./linux/kernel/git/mmind/linux-rockchip into next/soc Merge "CPU-Hotplug support for RK3066 and RK3188" from Heiko Stuebner: * tag 'v3.17-rockchip-smp-hotplug' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: rockchip: Add cpu hotplug support for RK3XXX SoCs ARM: rockchip: select ARMv7 compiler flags for platsmp.o Signed-off-by: Arnd Bergmann --- 03eea7cda20128f97fa281650ada69fe19194d56