tree 0f1777542b385ebefd30b3586d830fd8ed6fda5b
parent 75e33751ca8bbb72dd6f1a74d2810ddc8cbe4bdf
parent d28daf923ac5e4a0d7cecebae56f3e339189366b
author Ingo Molnar <mingo@elte.hu> 1252304391 +0200
committer Ingo Molnar <mingo@elte.hu> 1252304391 +0200

Merge branch 'tracing/core' into tracing/hw-breakpoints

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

Merge reason: resolve the conflicts, plus adopt to the new
              ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>