Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Dec 2014 03:59:22 +0000 (19:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Dec 2014 03:59:22 +0000 (19:59 -0800)
commit9c37f95936b6c169e89733747504879b06e77c24
tree9d03d0c8f8b716d7d232975ca6e89f0f33cd1602
parenta0e4467726cd26bacb16f13d207ffcfa82ffc07d
parent78bff1c8684fb94f1ae7283688f90188b53fc433
Merge branch 'core-locking-for-linus' of git://git./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
arch/x86/include/asm/spinlock.h