From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 22 Feb 2009 17:12:01 +0000 (+0100)
Subject: Merge branch 'tip/x86/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted... 
X-Git-Tag: v2.6.30-rc1~2^2~89
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c478f8786973d6d7552c652ddad3f6fd86b5af28;p=pandora-kernel.git

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

Conflicts:
	include/linux/ftrace.h
	kernel/trace/ftrace.c
---

c478f8786973d6d7552c652ddad3f6fd86b5af28
Reading git-diff-tree failed