From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 12 Jan 2016 10:01:12 +0000 (+0100)
Subject: Merge branches 'clockevents/4.4-fixes' and 'clockevents/4.5-fixes' of http://git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1f16f116b01c110db20ab808562c8b8bc3ee3d6e;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

1f16f116b01c110db20ab808562c8b8bc3ee3d6e