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

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

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

d06bbd669539215405874d8fe32ab65105e6c4bb
Reading git-diff-tree failed