tree b340cb74237427dbdbdacf618c42e8b0bd8d21d5
parent 21806261b6cc1068197ea6c8891b857f16260fee
parent 17aacfb9cdf9a8329a6ece9c437551a29c93e47b
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1194118972 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1194118972 -0700

Merge branch 'v2.6.24-rc1-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep

* 'v2.6.24-rc1-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep:
  lockdep: fix a typo in the __lock_acquire comment
  sched: fix unconditional irq lock
  lockdep: fixup irq tracing