Merge tag 'v4.7-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Wed, 13 Apr 2016 22:27:05 +0000 (15:27 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 13 Apr 2016 22:27:05 +0000 (15:27 -0700)
commitf8433ac982fa2adb409797b3b8619e5980f6947a
treebec1d02c4eb8296c2a04aa7e2c454a07a0870236
parent4b051f925c3a924ccb6e56f1768140d7f726db7b
parent26d5192953d88d6231d173281848a1c61f9e5d34
Merge tag 'v4.7-rockchip-soc32-1' of git://git./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>