]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commite743def161f377ea214c2333001ec8c86418c94e
treeda38a3ae51128dfb959fb53d633201ab4ffb4209
parent8ee12afd1a573410190272d97399de57a2f478e8
parentb487b899ada9949759d16561dd4c156d64c61ed0
Merge branch 'for-next/timers' of git://git.kernel.org/pub/scm/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