From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 7 Sep 2009 06:19:51 +0000 (+0200)
Subject: Merge branch 'tracing/core' into tracing/hw-breakpoints
X-Git-Tag: v2.6.33-rc1~399^2~146^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1922ed661ab2c1637d0b10cde933bd9cd33d965;p=pandora-kernel.git

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>
---

a1922ed661ab2c1637d0b10cde933bd9cd33d965
Reading git-diff-tree failed