| commit | 1f16f116b01c110db20ab808562c8b8bc3ee3d6e | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Tue Jan 12 11:01:12 2016 +0100 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Tue Jan 12 11:01:12 2016 +0100 |
| tree | 44db563f64cf5f8d62af8f99a61e2b248c44ea3a | |
| parent | 03724ac3d48f8f0e3caf1d30fa134f8fd96c94e2 [diff] | |
| parent | f9eccf24615672896dc13251410c3f2f33a14f95 [diff] |
Merge branches 'clockevents/4.4-fixes' and 'clockevents/4.5-fixes' of http://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)