tree 2ebcacf036fce1b075fe267f608b6abe3f196c67
parent 12fe32e4f942ac5c71a4ab70b039fee65c0dc29d
parent eedeeabdeeadb016b8c783e3620d06b98d0cb4e1
author Linus Torvalds <torvalds@linux-foundation.org> 1239050250 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1239050250 -0700

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

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