Merge branches 'clockevents/4.4-fixes' and 'clockevents/4.5-fixes' of http://git...
authorThomas Gleixner <tglx@linutronix.de>
Tue, 12 Jan 2016 10:01:12 +0000 (11:01 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 12 Jan 2016 10:01:12 +0000 (11:01 +0100)
commit1f16f116b01c110db20ab808562c8b8bc3ee3d6e
tree44db563f64cf5f8d62af8f99a61e2b248c44ea3a
parent03724ac3d48f8f0e3caf1d30fa134f8fd96c94e2
parentf9eccf24615672896dc13251410c3f2f33a14f95
Merge branches 'clockevents/4.4-fixes' and 'clockevents/4.5-fixes' of git.linaro.org/people/daniel.lezcano/linux into timers/urgent

Pull in fixes from Daniel Lezcano:

 - Fix the vt8500 timer leading to a system lock up when dealing with too
   small delta (Roman Volkov)

 - Select the CLKSRC_MMIO when the fsl_ftm_timer is enabled with COMPILE_TEST
   (Daniel Lezcano)

 - Prevent to compile timers using the 'iomem' API when the architecture has
   not HAS_IOMEM set (Richard Weinberger)
MAINTAINERS
arch/arm/Kconfig
drivers/clocksource/vt8500_timer.c