From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Mon, 29 Dec 2008 09:47:05 +0000 (+0200)
Subject: Merge branch 'topic/failslab' into for-linus
X-Git-Tag: v2.6.29-rc1~565^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c506efd7e0f615bd9603ce8c06bc4a896952599;p=pandora-kernel.git

Merge branch 'topic/failslab' into for-linus

Conflicts:

	mm/slub.c

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---

3c506efd7e0f615bd9603ce8c06bc4a896952599
Reading git-diff-tree failed