]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'v2.6.24-rc7-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 16 Jan 2008 17:55:49 +0000 (09:55 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 16 Jan 2008 17:55:49 +0000 (09:55 -0800)
* 'v2.6.24-rc7-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep:
  lockdep: more hardirq annotations for notify_die()
  lockdep: fix workqueue creation API lockdep interaction
  lockdep: fix internal double unlock during self-test


Trivial merge