Merge branch 'tracing/core-v2' into tracing-for-linus
Ingo Molnar authored
Conflicts:
	include/linux/slub_def.h
	lib/Kconfig.debug
	mm/slob.c
	mm/slub.c
8302294f