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

mm/slub.c

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

Trivial merge