diff options
author | 2014-03-29 15:01:09 -0700 | |
---|---|---|
committer | 2014-03-29 15:01:09 -0700 | |
commit | 981e893ed537cbaa08f8089d480db4165e6d71c0 (patch) | |
tree | b0e8f100477be9e25feced30a9c1cbd75e0dc408 /net/unix/sysctl_net_unix.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client (diff) | |
parent | time: Revert to calling clock_was_set_delayed() while in irq context (diff) | |
download | wireguard-linux-981e893ed537cbaa08f8089d480db4165e6d71c0.tar.xz wireguard-linux-981e893ed537cbaa08f8089d480db4165e6d71c0.zip |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Ingo Molnar:
"A late breaking fix from John. (The bug fixed has a hard lockup
potential, but that was not observed, warnings were)"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
time: Revert to calling clock_was_set_delayed() while in irq context
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
0 files changed, 0 insertions, 0 deletions