| commit | a335358f52aec4397594043ac799d15f92e728dd | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Thu Feb 28 10:12:04 2013 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Thu Feb 28 10:12:04 2013 +0100 |
| tree | 8146f2c71be7a05ef1615a431adecd9ec46d3e2f | |
| parent | ff1fb5f6b4925a536ffb8171e5f2dbd01ccfeb97 [diff] | |
| parent | db05021d49a994ee40a9735d9c3cb0060c9babb8 [diff] |
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>