Merge branch 'for-next/timers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...
authorWill Deacon <will.deacon@arm.com>
Wed, 1 May 2019 14:45:36 +0000 (15:45 +0100)
committerWill Deacon <will.deacon@arm.com>
Wed, 1 May 2019 14:45:36 +0000 (15:45 +0100)
commit24cf262da1ad303fc940c798aab0bd1bd50e3fc2
treeda38a3ae51128dfb959fb53d633201ab4ffb4209
parent50abbe19623e08e2aa34e0e526bd6115569f3dc3
parent0ea415390cd345b7d09e8c9ebd4b68adfe873043
Merge branch 'for-next/timers' of git://git./linux/kernel/git/arm64/linux into for-next/core

Conflicts:
arch/arm64/Kconfig
arch/arm64/include/asm/arch_timer.h
arch/arm64/Kconfig
arch/arm64/include/asm/arch_timer.h
arch/arm64/kernel/cpu_errata.c
arch/arm64/kernel/traps.c
drivers/clocksource/arm_arch_timer.c