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)
commit970e2dfa672b5b26967b0983e24b8d92f972c907
tree48ca21427d8c9c87a574ccd8dd7350a00419fa93
parent3a3485be68c3b44dd7e3790472976fdc2467bb40
parent2208b764c14d0f1ad63da64b1a42db6077b6fe42
Merge branch 'to-linus' of git://git./linux/kernel/git/christoph/slab

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