Conflicts:

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