Merge branch 'slab/urgent' into slab/for-linus

author Pekka Enberg <penberg@kernel.org>

Wed, 11 Jan 2012 19:11:29 +0000 (21:11 +0200)

committer Pekka Enberg <penberg@kernel.org>

Wed, 11 Jan 2012 19:11:29 +0000 (21:11 +0200)
author Pekka Enberg <penberg@kernel.org>
Wed, 11 Jan 2012 19:11:29 +0000 (21:11 +0200)
committer Pekka Enberg <penberg@kernel.org>
Wed, 11 Jan 2012 19:11:29 +0000 (21:11 +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>
	Wed, 11 Jan 2012 19:11:29 +0000 (21:11 +0200)
committer	Pekka Enberg <penberg@kernel.org>
	Wed, 11 Jan 2012 19:11:29 +0000 (21:11 +0200)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
mm/slab.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/slub.c	patch \|	diff1 \|	diff2 \|	blob \| history