From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Thu, 10 Sep 2009 23:09:23 +0000 (+0200)
Subject: Merge commit 'tracing/core' into tracing/kprobes
X-Git-Tag: v2.6.33-rc1~399^2~228
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f8ffe2485bcaa890800681451d380779cea06af;p=pandora-kernel.git

Merge commit 'tracing/core' into tracing/kprobes

Conflicts:
	kernel/trace/trace_export.c
	kernel/trace/trace_kprobe.c

Merge reason: This topic branch lacks an important
build fix in tracing/core:

	0dd7b74787eaf7858c6c573353a83c3e2766e674:
	tracing: Fix double CPP substitution in TRACE_EVENT_FN

that prevents from multiple tracepoint headers inclusion crashes.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
---

8f8ffe2485bcaa890800681451d380779cea06af
Reading git-diff-tree failed