tree 8419a65de08183e350a468433fb3f4205e49ae80
parent f945b7abcb6cfd3106c9855aa2aa6e4396a19d76
parent 7bee946358c3cb957d4aa648fc5ab3cad0b232d0
author Linus Torvalds <torvalds@linux-foundation.org> 1238804993 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1238804993 -0700

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