From: Linus Torvalds Date: Fri, 5 Mar 2010 22:35:40 +0000 (-0800) Subject: Merge branch 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penber... X-Git-Tag: v2.6.34-rc1~189 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=64096c17417380d8a472d096645f4cbc9406c987;p=profile%2Fcommon%2Fkernel-common.git Merge branch 'slab-for-linus' of git://git./linux/kernel/git/penberg/slab-2.6 * 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: SLUB: Fix per-cpu merge conflict failslab: add ability to filter slab caches slab: fix regression in touched logic dma kmalloc handling fixes slub: remove impossible condition slab: initialize unused alien cache entry as NULL at alloc_alien_cache(). SLUB: Make slub statistics use this_cpu_inc SLUB: this_cpu: Remove slub kmem_cache fields SLUB: Get rid of dynamic DMA kmalloc cache allocation SLUB: Use this_cpu operations in slub --- 64096c17417380d8a472d096645f4cbc9406c987