Merge branch 'v2.6.24-rc1-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 3 Nov 2007 19:42:52 +0000 (12:42 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 3 Nov 2007 19:42:52 +0000 (12:42 -0700)
commita7e1e001f432d5960b929787a2a261cf5a7ddac5
treeb340cb74237427dbdbdacf618c42e8b0bd8d21d5
parent21806261b6cc1068197ea6c8891b857f16260fee
parent17aacfb9cdf9a8329a6ece9c437551a29c93e47b
Merge branch 'v2.6.24-rc1-lockdep' of git://git./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
arch/x86/mm/fault_32.c