Merge tag 'v4.3-rockchip32-soc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Fri, 17 Jul 2015 17:36:32 +0000 (10:36 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 17 Jul 2015 17:37:08 +0000 (10:37 -0700)
commitd7030a08f6b05b3d146601b1f33595e2f5585117
treebd025d562f71f24bacc801d3c50fe62f67661bea
parentbc0195aad0daa2ad5b0d76cce22b167bc3435590
parentcb8cc37f4d38d96552f2c52deb15e511cdacf906
Merge tag 'v4.3-rockchip32-soc1' of git://git./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>