From: Pekka Enberg <penberg@kernel.org>
Date: Fri, 11 Mar 2011 16:10:45 +0000 (+0200)
Subject: Merge branch 'slab/rcu' into slab/next
X-Git-Tag: v2.6.39-rc1~388^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9149556756d56c68451a4a8735c37e7062fd3d7;p=pandora-kernel.git

Merge branch 'slab/rcu' into slab/next

Conflicts:
	mm/slub.c
---

c9149556756d56c68451a4a8735c37e7062fd3d7
Reading git-diff-tree failed