diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-09 19:59:22 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-09 19:59:22 -0800 |
commit | 9c37f95936b6c169e89733747504879b06e77c24 (patch) | |
tree | 9d03d0c8f8b716d7d232975ca6e89f0f33cd1602 /arch/xtensa/kernel/time.c | |
parent | a0e4467726cd26bacb16f13d207ffcfa82ffc07d (diff) | |
parent | 78bff1c8684fb94f1ae7283688f90188b53fc433 (diff) | |
download | op-kernel-dev-9c37f95936b6c169e89733747504879b06e77c24.zip op-kernel-dev-9c37f95936b6c169e89733747504879b06e77c24.tar.gz |
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking tree changes from Ingo Molnar:
"Two changes: a documentation update and a ticket locks live lock fix"
* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/ticketlock: Fix spin_unlock_wait() livelock
locking/lglocks: Add documentation of current lglocks implementation
Diffstat (limited to 'arch/xtensa/kernel/time.c')
0 files changed, 0 insertions, 0 deletions