Merge branch 'slab-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Mar 2008 18:30:17 +0000 (11:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Mar 2008 18:30:17 +0000 (11:30 -0700)
* 'slab-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm:
  slab: fix cache_cache bootstrap in kmem_cache_init()
  count_partial() is not used if !SLUB_DEBUG and !CONFIG_SLABINFO


Trivial merge