diff options
author | 2016-06-03 15:37:27 -0700 | |
---|---|---|
committer | 2016-06-03 15:37:27 -0700 | |
commit | 2c221325635ed09a6eea10a362d8514d5943ad7d (patch) | |
tree | fd4f3aafa91c01be7e1cea072b2991c1f8516a92 /net/unix/af_unix.c | |
parent | Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm (diff) | |
parent | time: Make settimeofday error checking work again (diff) | |
download | wireguard-linux-2c221325635ed09a6eea10a362d8514d5943ad7d.tar.xz wireguard-linux-2c221325635ed09a6eea10a362d8514d5943ad7d.zip |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer bugfix from Thomas Gleixner:
"A single bugfix for the error check wreckage we introduced in the
merge window"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
time: Make settimeofday error checking work again
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions