From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 27 Feb 2009 08:06:11 +0000 (+0100)
Subject: Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~13991^2~273^2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=da74ff0f9b31ed97104c22c278bf2b41bcf8f33c;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	kernel/sched_clock.c
---

da74ff0f9b31ed97104c22c278bf2b41bcf8f33c