From: Olof Johansson Date: Thu, 2 Apr 2015 00:52:02 +0000 (-0700) Subject: Merge tag 'v4.1-rockchip-soc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind... X-Git-Tag: Ubuntu-5.2.0-15.16~11471^2~10 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=824f25c1ccded5de2d3e18268b91cddccdad3868;p=mirror_ubuntu-eoan-kernel.git Merge tag 'v4.1-rockchip-soc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc Merge "ARM: rockchip: soc code changes for 4.1" from Heiko Stuebner: Some suspend improvements reducing resume time and making sure the watchdog does not reset after 12 hours and a change to constify and staticize some smp parts. * tag 'v4.1-rockchip-soc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: rockchip: disable watchdog during suspend ARM: rockchip: decrease the wait time for resume ARM: rockchip: Constify struct regmap_config and staticize local function Signed-off-by: Olof Johansson --- 824f25c1ccded5de2d3e18268b91cddccdad3868