From: Pekka Enberg <penberg@kernel.org>
Date: Mon, 23 May 2011 16:50:39 +0000 (+0300)
Subject: Merge branch 'slab/next' into for-linus
X-Git-Tag: v3.0-rc1~341^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfb91fb650e988c3c347e50fc75fedb7d4f0c018;p=pandora-kernel.git

Merge branch 'slab/next' into for-linus

Conflicts:
	mm/slub.c
---

bfb91fb650e988c3c347e50fc75fedb7d4f0c018
Reading git-diff-tree failed