| commit | 492f59f526d95e73028f57bff475b4bbe3c8cb72 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 03 17:29:53 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 03 17:29:53 2009 -0700 |
| tree | 8419a65de08183e350a468433fb3f4205e49ae80 | |
| parent | f945b7abcb6cfd3106c9855aa2aa6e4396a19d76 [diff] | |
| parent | 7bee946358c3cb957d4aa648fc5ab3cad0b232d0 [diff] |
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