tree 5ca8dc6bb09bcb2c4b959b60712d7a3f60c7a43f
parent 023dc70470502f41b285112d4840f35d9075b767
parent f28510d30c7f03daa290019fbc57ad8277347614
author Pekka Enberg <penberg@kernel.org> 1349247397 +0300
committer Pekka Enberg <penberg@kernel.org> 1349247397 +0300

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: Pekka Enberg <penberg@kernel.org>