tree 4e5c9ef6a09d234119a49d2623a0d042fe3af125
parent f8f5701bdaf9134b1f90e5044a82c66324d2073f
parent 57d437d2aa680f42d75cef45205834d5f605550a
author Pekka Enberg <penberg@kernel.org> 1338794098 +0300
committer Pekka Enberg <penberg@kernel.org> 1338794098 +0300

Merge branch 'slub/cleanups' into slab/next

* Fix a merge conflict in mm/slub.c::acquire_slab() due to commit 02d7633
  ("slub: fix a memory leak in get_partial_node()").

Conflicts:
	mm/slub.c

Signed-off-by: Pekka Enberg <penberg@kernel.org>