]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'slab/next' into for-next
authorPekka Enberg <penberg@kernel.org>
Tue, 25 Sep 2012 07:35:37 +0000 (10:35 +0300)
committerPekka Enberg <penberg@kernel.org>
Tue, 25 Sep 2012 07:35:37 +0000 (10:35 +0300)
commit2b1b4851093f9f5c123f2b543fc4567a7bd3910c
tree9c7b2d33b6ee2bc2e56e9d258916494ef84792ba
parent333115fe33d3e784a3be984fd2d4588f57396ff6
parent2b847c3cb4f8565911bd8ce59b8428e635c90594
Merge branch 'slab/next' into for-next

The minor conflict is between NUMA_NO_NODE cleanups and slab cgroups
changes.

Conflicts:
mm/slob.c

Signed-off-by: Pekka Enberg <penberg@kernel.org>
mm/slab.c
mm/slob.c
mm/slub.c