Merge tag 'arch-timer-gtdt' of git://git.kernel.org/pub/scm/linux/kernel/git/mark...
authorThomas Gleixner <tglx@linutronix.de>
Thu, 20 Apr 2017 06:28:34 +0000 (08:28 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 20 Apr 2017 06:28:34 +0000 (08:28 +0200)
commit26e42a020471ffc9a4086feb3900976a49cff42b
tree5b6435fa4021b020a371f97bab4637364f13f3aa
parent821596a50aba6873ff4ea8fdf2b1515638c3c8a3
parentca9ae5ec4ef0ed13833b03297ab319676965492c
Merge tag 'arch-timer-gtdt' of git://git./linux/kernel/git/mark/linux into timers/core

Pull arch timer GTDT support from Mark Rutland

- arch_timer cleanups and refactoring
- new common GTDT parser
- GTDT-based MMIO arch_timer support
- GTDT-based SBSA watchdog support

Fix up a trivial pr_err() conflict.