Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
commit3e42dee676e8cf5adca817b1518b2e99d1c138ff
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Jul 2013 23:07:52 +0000 (2 16:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Jul 2013 23:07:52 +0000 (2 16:07 -0700)
tree23580fe97d1e452667b507c2aadb99877d0b574c
parent42daabf62bfa3c00974b43f030dadcf704c0db59
parent88c8004fd3a5fdd2378069de86b90b21110d33a4
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"
mm/hugetlb.c