]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitdf3e5804bc37270003b4e74bd541391b84ac32a7
tree9d03d0c8f8b716d7d232975ca6e89f0f33cd1602
parentdb43d50145194c19040bfcc543f0cad9f0905a92
parentf1fe56ac8b2bcdf0436f002e3c739eef865f5f30
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
arch/x86/include/asm/spinlock.h