From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 19 Dec 2008 08:42:40 +0000 (+0100)
Subject: Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into... 
X-Git-Tag: v2.6.29-rc1~586^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30cd324e9787ccc9a5ede59742d5409857550692;p=pandora-kernel.git

Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into tracing/core

Conflicts:
	include/linux/ftrace.h
---

30cd324e9787ccc9a5ede59742d5409857550692
Reading git-diff-tree failed