From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 20 Apr 2017 06:28:34 +0000 (+0200)
Subject: Merge tag 'arch-timer-gtdt' of git://git.kernel.org/pub/scm/linux/kernel/git/mark... 
X-Git-Tag: v4.12-rc1~157^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26e42a020471ffc9a4086feb3900976a49cff42b;p=thirdparty%2Flinux.git

Merge tag 'arch-timer-gtdt' of git://git.kernel.org/pub/scm/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.
---

26e42a020471ffc9a4086feb3900976a49cff42b