Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Mon, 6 Apr 2009 20:37:30 +0000 (13:37 -0700)]
* 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  lockdep: add stack dumps to asserts
  hrtimer: fix rq->lock inversion (again)

1  2 
include/linux/interrupt.h
kernel/lockdep.c
kernel/sched.c
kernel/softirq.c

Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge