From: Olof Johansson Date: Wed, 13 Apr 2016 22:27:05 +0000 (-0700) Subject: Merge tag 'v4.7-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v4.7-rc1~139^2~3 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f8433ac982fa2adb409797b3b8619e5980f6947a;p=karo-tx-linux.git 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 --- f8433ac982fa2adb409797b3b8619e5980f6947a