Merge branches 'slab/next' and 'slub/partial' into slab/for-linus
commite182a345d40deba7c3165a2857812bf403818319
authorPekka Enberg <penberg@kernel.org>
Wed, 26 Oct 2011 15:09:12 +0000 (26 18:09 +0300)
committerPekka Enberg <penberg@kernel.org>
Wed, 26 Oct 2011 15:09:12 +0000 (26 18:09 +0300)
tree01cace799491cbb6bea19c10de971fd3a84d9868
parent3cfef9524677a4ecb392d6fbffe6ebce6302f1d4
parentfe353178653b15add8626f5474842601be160281
parentdcc3be6a548a1e51adaab3be6d9dfbb68bc0e3a0
Merge branches 'slab/next' and 'slub/partial' into slab/for-linus
include/linux/mm_types.h
mm/slub.c
tools/slub/slabinfo.c