From: Ingo Molnar <mingo@kernel.org>
Date: Thu, 28 Feb 2013 09:12:04 +0000 (+0100)
Subject: Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste... 
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~11112^2~90
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a335358f52aec4397594043ac799d15f92e728dd;p=mirror_ubuntu-zesty-kernel.git

Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent

Pull an ftrace Kconfig help text fix from Steve Rostedt.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

a335358f52aec4397594043ac799d15f92e728dd