From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 19 Nov 2008 09:04:25 +0000 (+0100)
Subject: Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
X-Git-Tag: v2.6.29-rc1~586^2~56
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9676e73a9e0cbdc521e1ebf4e13e6e5aada34247;p=pandora-kernel.git

Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core

Conflicts:
	kernel/trace/ftrace.c

[ We conflicted here because we backported a few fixes to
  tracing/urgent - which has different internal APIs. ]
---

9676e73a9e0cbdc521e1ebf4e13e6e5aada34247
Reading git-diff-tree failed