tree a8109ce649b4ef26998254088a54b01acd3df73f
parent 94095a1fff89dffe9451839deae4c6a40cf3ec21
parent 4fe84fb8c6b5081f7364af63aee8e118a665b966
author Linus Torvalds <torvalds@linux-foundation.org> 1349112438 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1349112438 -0700

Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/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