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

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