Merge branches 'slab/urgent' and 'slab/next' into for-next

author Pekka Enberg <penberg@kernel.org>

Tue, 13 Dec 2011 20:14:52 +0000 (22:14 +0200)

committer Pekka Enberg <penberg@kernel.org>

Tue, 13 Dec 2011 20:14:52 +0000 (22:14 +0200)
author Pekka Enberg <penberg@kernel.org>
Tue, 13 Dec 2011 20:14:52 +0000 (22:14 +0200)
committer Pekka Enberg <penberg@kernel.org>
Tue, 13 Dec 2011 20:14:52 +0000 (22:14 +0200)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc mm/slab.c
Simple merge
diff --cc mm/slub.c
Simple merge
author	Pekka Enberg <penberg@kernel.org>
	Tue, 13 Dec 2011 20:14:52 +0000 (22:14 +0200)
committer	Pekka Enberg <penberg@kernel.org>
	Tue, 13 Dec 2011 20:14:52 +0000 (22:14 +0200)
		1	2	3
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
mm/slab.c	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
mm/slub.c	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history