From: Arnd Bergmann Date: Thu, 20 Nov 2014 16:18:43 +0000 (+0100) Subject: Merge tag 'v3.19-rockchip-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2db0aea590246b570b9352659f065727900c6f69;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git Merge tag 'v3.19-rockchip-soc2' of git://git./linux/kernel/git/mmind/linux-rockchip into next/soc Pull "code part of the rk3288 smp support" from Heiko Stübner: here is the second batch of soc related changes, consisting only of the smp support for rk3288. Due to the slight misheap of the v3.18 cpuclk pull being merge, it is based on exactly this merge commit from Olof to next/soc. * tag 'v3.19-rockchip-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: rockchip: add basic smp support for rk3288 ARM: rockchip: add option to access the pmu via a phandle in smp_operations ARM: rockchip: convert to regmap and use pmu syscon if available Signed-off-by: Arnd Bergmann --- 2db0aea590246b570b9352659f065727900c6f69