OSDN Git Service

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)
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.


Trivial merge