Merge tag 'v4.7-rockchip-soc32-1' of...

Merge tag 'v4.7-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/cleanup

Fix for a sparse build warning in the smp code.

* tag 'v4.7-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  ARM: rockchip: Fix use of plain integer as NULL pointer

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