From: Pekka Enberg Date: Tue, 18 Dec 2012 10:46:20 +0000 (+0200) Subject: Merge branch 'slab/next' into slab/for-linus X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=08afe22c68d8c07e8e31ee6491c37f36199ba14b;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'slab/next' into slab/for-linus Fix up a trivial merge conflict with commit baaf1dd ("mm/slob: use min_t() to compare ARCH_SLAB_MINALIGN") that did not go through the slab tree. Conflicts: mm/slob.c Signed-off-by: Pekka Enberg --- 08afe22c68d8c07e8e31ee6491c37f36199ba14b