]> Git Repo - J-linux.git/commitdiff
Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <[email protected]>
Sat, 4 Apr 2009 00:29:53 +0000 (17:29 -0700)
committerLinus Torvalds <[email protected]>
Sat, 4 Apr 2009 00:29:53 +0000 (17:29 -0700)
* '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


Trivial merge
This page took 0.049755 seconds and 4 git commands to generate.