From: Pekka Enberg <penberg@kernel.org>
Date: Sun, 20 Mar 2011 16:13:26 +0000 (+0200)
Subject: Merge branch 'slub/lockless' into for-linus
X-Git-Tag: v2.6.39-rc1~388^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8c500c2b64b6e237e67ecba7249e72363c47047;p=pandora-kernel.git

Merge branch 'slub/lockless' into for-linus

Conflicts:
	include/linux/slub_def.h
---

e8c500c2b64b6e237e67ecba7249e72363c47047
Reading git-diff-tree failed