projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f945b7a 7bee946)
Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Apr 2009 00:29:53 +0000 (17:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Apr 2009 00:29:53 +0000 (17:29 -0700)
commit492f59f526d95e73028f57bff475b4bbe3c8cb72
tree8419a65de08183e350a468433fb3f4205e49ae80tree | snapshot (tar.gz zip)
parentf945b7abcb6cfd3106c9855aa2aa6e4396a19d76commit | diff
parent7bee946358c3cb957d4aa648fc5ab3cad0b232d0commit | diff
Merge branch 'locking-for-linus' of git://git./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
Motorola kernel-slsi