From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 11 Mar 2018 21:55:15 +0000 (-0700)
Subject: Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.16-rc5~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ad5daa65395740d80aa7b2ac11887791142e018;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fix from Thomas Gleixner:
 "Just a single fix which adds a missing Kconfig dependency to avoid
  unmet dependency warnings"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource/atmel-st: Add 'depends on HAS_IOMEM' to fix unmet dependency
---

1ad5daa65395740d80aa7b2ac11887791142e018