]> Git Repo - linux.git/commit
projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 023dc70 f28510d)
Merge branch 'slab/common-for-cgroups' into slab/for-linus
authorPekka Enberg <[email protected]>
Wed, 3 Oct 2012 06:56:37 +0000 (09:56 +0300)
committerPekka Enberg <[email protected]>
Wed, 3 Oct 2012 06:56:37 +0000 (09:56 +0300)
commitf4178cdddd4cb860a17f363fe13264fff03da7f2
tree5ca8dc6bb09bcb2c4b959b60712d7a3f60c7a43ftree | snapshot
parent023dc70470502f41b285112d4840f35d9075b767commit | diff
parentf28510d30c7f03daa290019fbc57ad8277347614commit | diff
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 <[email protected]>
mm/slab.c diff1 | diff2 | blob | history
mm/slob.c diff1 | diff2 | blob | history
mm/slub.c diff1 | diff2 | blob | history
Empty description
This page took 0.048775 seconds and 4 git commands to generate.