Skip to content
Commit f4178cdd authored by Pekka Enberg's avatar Pekka Enberg
Browse files

Merge branch 'slab/common-for-cgroups' into slab/for-linus 



Fix up a trivial conflict with NUMA_NO_NODE cleanups.

Conflicts:
	mm/slob.c

Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
parents 023dc704 f28510d3
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment