Merge tag 'v4.3-rockchip32-soc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc
Merge "Rockchip soc changes for 4.3, part1" from Heiko Stuebner:
Some suspend improvements enabling the possibility to wakeup
from usbphy events and a rework of how cpu cores are brought
up and down, as it was possible to produce lockups when
hammering the cpu hotplug functions.
* tag 'v4.3-rockchip32-soc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: rockchip: fix broken build
ARM: rockchip: remove some useless macro in pm.h
ARM: rockchip: add support holding 24Mhz osc during suspend
ARM: rockchip: fix the SMP code style
ARM: rockchip: ensure CPU to enter WFI/WFE state
ARM: rockchip: fix the CPU soft reset
ARM: rockchip: restore dapswjdp after suspend
Signed-off-by: Olof Johansson <olof@lixom.net>
