From: Olof Johansson Date: Wed, 24 Feb 2016 21:51:08 +0000 (-0800) Subject: Merge tag 'v4.6-rockchip-soc64-1' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: next-20160301~132^2~28^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8f4f2721ddc85a78e6a05c2d35953a351992d5dc;p=karo-tx-linux.git Merge tag 'v4.6-rockchip-soc64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/arm64 Enable the rockchip-specific timers on arm64 rockchip platforms. The driver got reworked to not use arm32-specific dsb calls in 4.5-rc1, so now we can safely enable it. * tag 'v4.6-rockchip-soc64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: Enable the timer on Rockchip architecture Signed-off-by: Olof Johansson --- 8f4f2721ddc85a78e6a05c2d35953a351992d5dc