Merge branch 'slab/common-for-cgroups' into slab/for-linus
authorPekka Enberg <penberg@kernel.org>
Wed, 3 Oct 2012 06:56:37 +0000 (09:56 +0300)
committerPekka Enberg <penberg@kernel.org>
Wed, 3 Oct 2012 06:56:37 +0000 (09:56 +0300)
commitf4178cdddd4cb860a17f363fe13264fff03da7f2
tree5ca8dc6bb09bcb2c4b959b60712d7a3f60c7a43f
parent023dc70470502f41b285112d4840f35d9075b767
parentf28510d30c7f03daa290019fbc57ad8277347614
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>
mm/slab.c
mm/slob.c
mm/slub.c