]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf22bf56dfff40fbb6069d4268803c39c63c7c353
tree5ca8dc6bb09bcb2c4b959b60712d7a3f60c7a43f
parentb941829f9dd0c84a8dc4614a87d73f2075ad27e0
parentd928c05e9408b75a63dd5f16199dd7eb37c3dc84
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