Merge branch 'slab/next' into for-next

author Pekka Enberg <penberg@kernel.org>

Sun, 7 Jul 2013 16:10:51 +0000 (19:10 +0300)

committer Pekka Enberg <penberg@kernel.org>

Sun, 7 Jul 2013 16:10:51 +0000 (19:10 +0300)
author Pekka Enberg <penberg@kernel.org>
Sun, 7 Jul 2013 16:10:51 +0000 (19:10 +0300)
committer Pekka Enberg <penberg@kernel.org>
Sun, 7 Jul 2013 16:10:51 +0000 (19:10 +0300)
diff --cc init/Kconfig
Simple merge
diff --cc mm/slub.c
Simple merge
author	Pekka Enberg <penberg@kernel.org>
	Sun, 7 Jul 2013 16:10:51 +0000 (19:10 +0300)
committer	Pekka Enberg <penberg@kernel.org>
	Sun, 7 Jul 2013 16:10:51 +0000 (19:10 +0300)
		1	2
init/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
mm/slub.c	patch \|	diff1 \|	diff2 \|	blob \| history