From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 26 Aug 2009 06:29:02 +0000 (+0200)
Subject: Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic... 
X-Git-Tag: v2.6.32-rc1~718^2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35dce1a99d010f3d738af4ce1b9b77302fdfe69c;p=pandora-kernel.git

Merge branch 'tracing/core' of git://git./linux/kernel/git/frederic/random-tracing into tracing/core

Conflicts:
	include/linux/tracepoint.h

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

35dce1a99d010f3d738af4ce1b9b77302fdfe69c
Reading git-diff-tree failed