diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-11 14:55:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-11 14:55:15 -0700 |
| commit | 1ad5daa65395740d80aa7b2ac11887791142e018 (patch) | |
| tree | 5cec6f6b97bef5c0ffc9356f859724311ab04075 /arch/x86/entry | |
| parent | ebb3762e8867941d72b5dd1778e7062e53833230 (diff) | |
| parent | bd2746f09e1d8e37164f53b846f5225f3d36ee2d (diff) | |
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
Diffstat (limited to 'arch/x86/entry')
0 files changed, 0 insertions, 0 deletions