Merge branch 'slab/tracing' into slab/for-linus
authorPekka Enberg <penberg@kernel.org>
Wed, 3 Oct 2012 06:57:17 +0000 (09:57 +0300)
committerPekka Enberg <penberg@kernel.org>
Wed, 3 Oct 2012 06:57:17 +0000 (09:57 +0300)
1  2 
mm/slab.c
mm/slob.c

diff --cc mm/slab.c
Simple merge
diff --cc mm/slob.c
Simple merge