diff --git a/[refs] b/[refs] index f62838bfb6e9..fcd216171728 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8d99832a582e0e164a1e209da445d2bb46d721b +refs/heads/master: 2a93a1f21480f3aa134fe0c48954b64b8a97ef25 diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c index fdf913dfc7e8..53e8c8bc0c98 100644 --- a/trunk/kernel/trace/ftrace.c +++ b/trunk/kernel/trace/ftrace.c @@ -1908,7 +1908,7 @@ int register_ftrace_function(struct ftrace_ops *ops) } /** - * unregister_ftrace_function - unresgister a function for profiling. + * unregister_ftrace_function - unregister a function for profiling. * @ops - ops structure that holds the function to unregister * * Unregister a function that was added to be called by ftrace profiling.