From: Olof Johansson Date: Fri, 23 Jan 2015 22:01:47 +0000 (-0800) Subject: Merge tag 'v3.20-rockchip-soc1' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: firefly_0821_release~176^2~2308^2~14 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0dcfd9e33da3d61510bb10ab74df98c02122b955;p=firefly-linux-kernel-4.4.55.git Merge tag 'v3.20-rockchip-soc1' of git://git./linux/kernel/git/mmind/linux-rockchip into next/soc Merge "ARM: rockchip: soc updates for v3.20" from Heiko Stübner: SoC parts of basic suspend support and removal of Cortex-A9 reference from the machine name. * tag 'v3.20-rockchip-soc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: rockchip: remove cpu-core name from machine name ARM: rockchip: Add pmu-sram binding ARM: rockchip: add suspend and resume for RK3288 Signed-off-by: Olof Johansson --- 0dcfd9e33da3d61510bb10ab74df98c02122b955