diff options
author | 2018-03-11 14:55:15 -0700 | |
---|---|---|
committer | 2018-03-11 14:55:15 -0700 | |
commit | 1ad5daa65395740d80aa7b2ac11887791142e018 (patch) | |
tree | 5cec6f6b97bef5c0ffc9356f859724311ab04075 /net/unix/af_unix.c | |
parent | Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
parent | clocksource/atmel-st: Add 'depends on HAS_IOMEM' to fix unmet dependency (diff) | |
download | wireguard-linux-1ad5daa65395740d80aa7b2ac11887791142e018.tar.xz wireguard-linux-1ad5daa65395740d80aa7b2ac11887791142e018.zip |
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 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions