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

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc mm/slab.c
Simple merge

diff --cc mm/slub.c
Simple merge