Conflicts:
	arch/Kconfig
	kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
              ring-buffer APIs.
Signed-off-by: NIngo Molnar <mingo@elte.hu>