From: Linus Torvalds Date: Sun, 15 Sep 2013 11:15:06 +0000 (-0400) Subject: Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg... X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=bff157b3ad4b9f6be0af6987fcd62deaf0f2b799;p=deliverable%2Flinux.git Merge branch 'slab/next' of git://git./linux/kernel/git/penberg/linux Pull SLAB update from Pekka Enberg: "Nothing terribly exciting here apart from Christoph's kmalloc unification patches that brings sl[aou]b implementations closer to each other" * 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux: slab: Use correct GFP_DMA constant slub: remove verify_mem_not_deleted() mm/sl[aou]b: Move kmallocXXX functions to common code mm, slab_common: add 'unlikely' to size check of kmalloc_slab() mm/slub.c: beautify code for removing redundancy 'break' statement. slub: Remove unnecessary page NULL check slub: don't use cpu partial pages on UP mm/slub: beautify code for 80 column limitation and tab alignment mm/slub: remove 'per_cpu' which is useless variable --- bff157b3ad4b9f6be0af6987fcd62deaf0f2b799