diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-09 22:42:04 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-09 22:42:04 -0500 |
| commit | 394e849b83463869e2267ea7acea002366e6fefc (patch) | |
| tree | 917ec5c564964d781ffbda2917efdf7cde252c72 /tools | |
| parent | 98267d33e2da8cd386212856a22f4a64b32834ab (diff) | |
| parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff) | |
Merge 3.18-rc4 into tty-next.
This resolves a merge issue with drivers/tty/serial/8250/8250_mtk.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/testing/selftests/ftrace/ftracetest | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/ftrace/ftracetest b/tools/testing/selftests/ftrace/ftracetest index a8f81c782856..515247601df4 100755 --- a/tools/testing/selftests/ftrace/ftracetest +++ b/tools/testing/selftests/ftrace/ftracetest | |||
| @@ -82,7 +82,7 @@ parse_opts() { # opts | |||
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | # Parameters | 84 | # Parameters |
| 85 | DEBUGFS_DIR=`grep debugfs /proc/mounts | cut -f2 -d' '` | 85 | DEBUGFS_DIR=`grep debugfs /proc/mounts | cut -f2 -d' ' | head -1` |
| 86 | TRACING_DIR=$DEBUGFS_DIR/tracing | 86 | TRACING_DIR=$DEBUGFS_DIR/tracing |
| 87 | TOP_DIR=`absdir $0` | 87 | TOP_DIR=`absdir $0` |
| 88 | TEST_DIR=$TOP_DIR/test.d | 88 | TEST_DIR=$TOP_DIR/test.d |