From: Pekka Enberg <penberg@kernel.org>
Date: Mon, 4 Jun 2012 07:14:58 +0000 (+0300)
Subject: Merge branch 'slub/cleanups' into slab/next
X-Git-Tag: v3.6-rc1~50^2~23
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23910c50cced8f35d53e4f8ea0cc09ad58d286af;p=pandora-kernel.git

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>
---

23910c50cced8f35d53e4f8ea0cc09ad58d286af
Reading git-diff-tree failed