From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 3 Nov 2007 19:42:52 +0000 (-0700)
Subject: Merge branch 'v2.6.24-rc1-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.24-rc2~45
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a7e1e001f432d5960b929787a2a261cf5a7ddac5;p=linux-2.6-omap-h63xx.git

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
---

a7e1e001f432d5960b929787a2a261cf5a7ddac5