linux-next: manual merge of the akpm tree with the slab tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
mm/slab_common.c between commit 77be4b1366c9 ("mm/slab: restructure
kmem_cache_create() debug checks") from the slab tree and commit
"mm/slab_common.c: cleanup" from the akpm tree.

Given that this akpm tree patch was applied to and then reverted from the
slab tree, I have just dropped it from the akpm tree.
-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

pgpwxlXfwQL1H.pgp
Description: PGP signature