]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit7a591070b26baa022f34d8ae5c5d60f09506fab6
tree8146f2c71be7a05ef1615a431adecd9ec46d3e2f
parent00fed5ca8c10e4961245e40bdcaa388116577e19
parentc76f56f9a9855b313956a395858bb69ebdffb726
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>