From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 11 Nov 2008 08:40:18 +0000 (+0100)
Subject: Merge branch 'tracing/urgent' into tracing/ftrace
X-Git-Tag: v2.6.29-rc1~586^2~80
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0cb4ebcd9e5b4ddd8216c20f54445c91b1fa4b9;p=pandora-kernel.git

Merge branch 'tracing/urgent' into tracing/ftrace

Conflicts:
	kernel/trace/trace.c
---

e0cb4ebcd9e5b4ddd8216c20f54445c91b1fa4b9
Reading git-diff-tree failed