]> 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)
commit2c961219a13ad7c6638b0cccd0eea97cc596d1ad
tree8146f2c71be7a05ef1615a431adecd9ec46d3e2f
parentbbb9bf48f8c9f70bde875098b7347ea877175cd3
parentfdb62c761090e52e8d0360cc7c52b8059f84969b
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>