From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Oct 2012 17:27:18 +0000 (-0700)
Subject: Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=627312b9a877983f2164a67d042541ec1ffc435b;p=openwrt%2Fstaging%2Fblogic.git

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

Pull core locking changes from Ingo Molnar:
 "It includes a lockdep improvement plus a spinlock inlining Kconfig
  cleanup."

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking: Adjust spin lock inlining Kconfig options
  lockdep: Check if nested lock is actually held
---

627312b9a877983f2164a67d042541ec1ffc435b