Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@kernel.org>
Thu, 28 Feb 2013 09:12:04 +0000 (10:12 +0100)
committerIngo Molnar <mingo@kernel.org>
Thu, 28 Feb 2013 09:12:04 +0000 (10:12 +0100)
Pull an ftrace Kconfig help text fix from Steve Rostedt.

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

Trivial merge