projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8f404fa ec1f5ee)
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)
commit5254149f6c4e938fea3735183434e208097bd188
tree452fbfbcd405d4d97d520d561a7c0236398e228ftree | snapshot
parent8f404faa72f4e458e7bd81ac75ce55ae829e953dcommit | diff
parentec1f5eeeb5a79a0d48036de649a3498da42db565commit | diff
Merge branch 'slab-linus' of git://git./linux/kernel/git/christoph/vm

* '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
John Crispins staging tree