Merge branch 'trace/trace/core' into trace/merge/upstream

 Conflicts:
	kernel/trace/trace.c