From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 9 Feb 2009 09:35:12 +0000 (+0100)
Subject: Merge branch 'tip/tracing/core/devel' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.30-rc1~2^2~124
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44b0635481437140b0e29d6023f05e805d5e7620;p=pandora-kernel.git

Merge branch 'tip/tracing/core/devel' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace

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

44b0635481437140b0e29d6023f05e805d5e7620
Reading git-diff-tree failed