diff options
| author | Ingo Molnar <[email protected]> | 2015-02-24 07:41:07 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2015-02-24 07:41:07 +0000 |
| commit | 2ae79026818e7d49fead82b79b1a543e3b9c8a23 (patch) | |
| tree | c7ee7bd8b37b0880918d361839fd95988fac2dac /lib/dynamic_debug.c | |
| parent | locking/rwsem: Check for active lock before bailing on spinning (diff) | |
| parent | Linux 4.0-rc1 (diff) | |
| download | kernel-2ae79026818e7d49fead82b79b1a543e3b9c8a23.tar.gz kernel-2ae79026818e7d49fead82b79b1a543e3b9c8a23.zip | |
Merge tag 'v4.0-rc1' into locking/core, to refresh the tree before merging new changes
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'lib/dynamic_debug.c')
| -rw-r--r-- | lib/dynamic_debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 527799d44476..d8f3d3150603 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -641,7 +641,7 @@ static __init int ddebug_setup_query(char *str) __setup("ddebug_query=", ddebug_setup_query); /* - * File_ops->write method for <debugfs>/dynamic_debug/conrol. Gathers the + * File_ops->write method for <debugfs>/dynamic_debug/control. Gathers the * command text from userspace, parses and executes it. */ #define USER_BUF_PAGE 4096 |