From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Sep 2015 15:45:23 +0000 (-0700)
Subject: Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~176^2~1051
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9786cff38a31c452e32fd2f9a479dd7d19d91712;p=firefly-linux-kernel-4.4.55.git

Merge branch 'locking-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull locking fixes from Ingo Molnar:
 "Spinlock performance regression fix, plus documentation fixes"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/static_keys: Fix up the static keys documentation
  locking/qspinlock/x86: Only emit the test-and-set fallback when building guest support
  locking/qspinlock/x86: Fix performance regression under unaccelerated VMs
  locking/static_keys: Fix a silly typo
---

9786cff38a31c452e32fd2f9a479dd7d19d91712