Merge tag 'v4.6-rockchip-soc64-1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Wed, 24 Feb 2016 21:51:08 +0000 (13:51 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 24 Feb 2016 21:51:08 +0000 (13:51 -0800)
commit8f4f2721ddc85a78e6a05c2d35953a351992d5dc
treedfc44e14e7071a6fce6f9e6bae47a201ffbc0930
parentefdda175c07f34d4c8dd38bf23be8d15ef37e32e
parentc840f28bbf643c361c463bcb8fb815d0b2dad4e8
Merge tag 'v4.6-rockchip-soc64-1' of git://git./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 <olof@lixom.net>