Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* '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)

diff --cc include/linux/interrupt.h
Simple merge

diff --cc kernel/lockdep.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/softirq.c
Simple merge