From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Dec 2014 03:59:22 +0000 (-0800)
Subject: Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9c37f95936b6c169e89733747504879b06e77c24;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

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
---

9c37f95936b6c169e89733747504879b06e77c24