tree 9d03d0c8f8b716d7d232975ca6e89f0f33cd1602
parent a0e4467726cd26bacb16f13d207ffcfa82ffc07d
parent 78bff1c8684fb94f1ae7283688f90188b53fc433
author Linus Torvalds <torvalds@linux-foundation.org> 1418183962 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1418183962 -0800

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