From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 4 Apr 2009 00:29:53 +0000 (-0700)
Subject: Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=492f59f526d95e73028f57bff475b4bbe3c8cb72;p=linux-2.6-omap-h63xx.git

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

* 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  locking: rename trace_softirq_[enter|exit] => lockdep_softirq_[enter|exit]
  lockdep: remove duplicate CONFIG_DEBUG_LOCKDEP definitions
  lockdep: require framepointers for x86
  lockdep: remove extra "irq" string
  lockdep: fix incorrect state name
---

492f59f526d95e73028f57bff475b4bbe3c8cb72