tree d5299adb43ac6fc8dcc50c3e438c7f0cdd452b1c
parent 6d16d6d9bb6f93e6f8506cfb3e91795d6443d54f
parent efbe2eee6dc0f179be84292bf269528b3ec365e9
author Linus Torvalds <torvalds@linux-foundation.org> 1311378201 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1311378201 -0700

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

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  lockdep: Fix lockdep_no_validate against IRQ states
  mutex: Make mutex_destroy() an inline function
  plist: Remove the need to supply locks to plist heads
  lockup detector: Fix reference to the non-existent CONFIG_DETECT_SOFTLOCKUP option