Merge branch 'slab/urgent' into slab/for-linus
Pekka Enberg [Wed, 11 Jan 2012 19:11:29 +0000 (21:11 +0200)]
1  2 
Documentation/kernel-parameters.txt
mm/slab.c
mm/slub.c

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