Merge tag 'v5.2-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Mon, 29 Apr 2019 16:56:30 +0000 (09:56 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 29 Apr 2019 16:56:30 +0000 (09:56 -0700)
Missing of_node_put and some added __init contants.

* tag 'v5.2-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: rockchip: add missing of_node_put in rockchip_smp_prepare_pmu
  ARM: rockchip: Mark pm-init functions __init

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge