Merge branch 'to-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 30 Jul 2007 19:39:15 +0000 (12:39 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 30 Jul 2007 19:39:15 +0000 (12:39 -0700)
* 'to-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/slab:
  slub: fix bug in slub debug support
  slub: add lock debugging check


Trivial merge