Merge branch 'topic/kmemtrace' of git://git.kernel.org/pub/scm/linux/kernel/git/penbe...

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

diff --cc MAINTAINERS
Simple merge

diff --cc init/main.c
Simple merge

diff --cc mm/slob.c
Simple merge

diff --cc mm/slub.c
Simple merge