diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-02-28 13:12:04 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-02-28 13:12:04 +0400 |
commit | a335358f52aec4397594043ac799d15f92e728dd (patch) | |
tree | 8146f2c71be7a05ef1615a431adecd9ec46d3e2f /net/unix/af_unix.c | |
parent | ff1fb5f6b4925a536ffb8171e5f2dbd01ccfeb97 (diff) | |
parent | db05021d49a994ee40a9735d9c3cb0060c9babb8 (diff) | |
download | linux-a335358f52aec4397594043ac799d15f92e728dd.tar.xz |
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>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions