Merge branch 'topic/failslab' into for-linus
commit3c506efd7e0f615bd9603ce8c06bc4a896952599
authorPekka Enberg <penberg@cs.helsinki.fi>
Mon, 29 Dec 2008 09:47:05 +0000 (29 11:47 +0200)
committerPekka Enberg <penberg@cs.helsinki.fi>
Mon, 29 Dec 2008 09:47:05 +0000 (29 11:47 +0200)
tree6ebc840535e9d93bf60e21e940a5f4558275a89d
parentfd37617e69fb865348d012eb1413aef0141ae2de
parent773ff60e841461cb1f9374a713ffcda029b8c317
Merge branch 'topic/failslab' into for-linus

Conflicts:

mm/slub.c

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
mm/slab.c
mm/slub.c