tree 85acd4440799c46a372df9cad170fa0c21e59096
parent 4fe70410d9a219dabb47328effccae7e7f2a6e26
parent 2e572895bf3203e881356a4039ab0fa428ed2639
author Ingo Molnar <mingo@elte.hu> 1238615659 +0200
committer Ingo Molnar <mingo@elte.hu> 1238626142 +0200

Merge branch 'tracing/core-v2' into tracing-for-linus

Conflicts:
	include/linux/slub_def.h
	lib/Kconfig.debug
	mm/slob.c
	mm/slub.c