]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'slab/next' into slab/for-linus
authorPekka Enberg <penberg@kernel.org>
Tue, 18 Dec 2012 10:46:20 +0000 (12:46 +0200)
committerPekka Enberg <penberg@kernel.org>
Tue, 18 Dec 2012 10:46:20 +0000 (12:46 +0200)
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 <penberg@kernel.org>

Trivial merge