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

author Pekka Enberg <penberg@kernel.org>

Wed, 3 Oct 2012 06:57:17 +0000 (09:57 +0300)

committer Pekka Enberg <penberg@kernel.org>

Wed, 3 Oct 2012 06:57:17 +0000 (09:57 +0300)
author Pekka Enberg <penberg@kernel.org>
Wed, 3 Oct 2012 06:57:17 +0000 (09:57 +0300)
committer Pekka Enberg <penberg@kernel.org>
Wed, 3 Oct 2012 06:57:17 +0000 (09:57 +0300)
diff --cc mm/slab.c
Simple merge
diff --cc mm/slob.c
Simple merge
author	Pekka Enberg <penberg@kernel.org>
	Wed, 3 Oct 2012 06:57:17 +0000 (09:57 +0300)
committer	Pekka Enberg <penberg@kernel.org>
	Wed, 3 Oct 2012 06:57:17 +0000 (09:57 +0300)
		1	2
mm/slab.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/slob.c	patch \|	diff1 \|	diff2 \|	blob \| history