Merge branch 'clockevents/4.12-fixes' of https://git.linaro.org/people/daniel.lezcano...
authorThomas Gleixner <tglx@linutronix.de>
Tue, 20 Jun 2017 10:50:32 +0000 (12:50 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 20 Jun 2017 10:50:32 +0000 (12:50 +0200)
commit8e6cec1c7c5afa489687c90be15d6ed82c742975
treebc11ebf33e34303bbc673c59d807686a3659d1e8
parentdbb236c1ceb697a559e0694ac4c9e7b9131d0b16
parent459fa246d8fa4a543ed9a3331f15c8fe1caf9937
Merge branch 'clockevents/4.12-fixes' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

Pull clockevents fixes from Daniel Lezcano:

 - Fixed wrong iomem area unmapped in the arch_arm_timer (Frank Rowand)

 - Added missing includes for sun5i and cadence-ttc (Stephen Rothwell)