| commit | 08afe22c68d8c07e8e31ee6491c37f36199ba14b | [log] [tgz] |
|---|---|---|
| author | Pekka Enberg <penberg@kernel.org> | Tue Dec 18 12:46:20 2012 +0200 |
| committer | Pekka Enberg <penberg@kernel.org> | Tue Dec 18 12:46:20 2012 +0200 |
| tree | 875d203149b74fddb50522fd5df3d6b154f5fe1e | |
| parent | a304f836a2e6d257c1f918b3431f97ef6b33e02e [diff] | |
| parent | 4590685546a374fb0f60682ce0e3a6fd48911d46 [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>