From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 Jul 2013 23:07:52 +0000 (-0700)
Subject: Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~176^2~5835
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3e42dee676e8cf5adca817b1518b2e99d1c138ff;p=firefly-linux-kernel-4.4.55.git

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

Pull locking changes from Ingo Molnar:
 "Four miscellanous standalone fixes for futexes, rtmutexes and
  Kconfig.locks."

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  futex: Use freezable blocking call
  futex: Take hugepages into account when generating futex_key
  rtmutex: Document rt_mutex_adjust_prio_chain()
  locking: Fix copy/paste errors of "ARCH_INLINE_*_UNLOCK_BH"
---

3e42dee676e8cf5adca817b1518b2e99d1c138ff