projects / profile / ivi / kernel-x86-ivi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a304f83 4590685)
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)
commit08afe22c68d8c07e8e31ee6491c37f36199ba14b
tree875d203149b74fddb50522fd5df3d6b154f5fe1etree | snapshot
parenta304f836a2e6d257c1f918b3431f97ef6b33e02ecommit | diff
parent4590685546a374fb0f60682ce0e3a6fd48911d46commit | diff
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 <penberg@kernel.org>
Domain: System / Uncategorized;