Merge branch 'slab/next' into slab/for-linus
Pekka Enberg [Tue, 7 May 2013 06:19:47 +0000 (09:19 +0300)]
1  2 
mm/slab.c
mm/slub.c

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