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)
commita335358f52aec4397594043ac799d15f92e728dd
tree8146f2c71be7a05ef1615a431adecd9ec46d3e2f
parentff1fb5f6b4925a536ffb8171e5f2dbd01ccfeb97
parentdb05021d49a994ee40a9735d9c3cb0060c9babb8
Merge branch 'tip/perf/urgent' of git://git./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>