diff --git a/[refs] b/[refs] index 662c892264c0..c4f8c27da0d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fbe74e361c6586cdd996bc2805033999dd469e99 +refs/heads/master: e6be0c9e7e9f68b99e5a5ba609c455bae4b141d5 diff --git a/trunk/include/linux/compiler.h b/trunk/include/linux/compiler.h index 4a243546d142..923d093c9cea 100644 --- a/trunk/include/linux/compiler.h +++ b/trunk/include/linux/compiler.h @@ -236,7 +236,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); /* * Rather then using noinline to prevent stack consumption, use - * noinline_for_stack instead. For documentaiton reasons. + * noinline_for_stack instead. For documentation reasons. */ #define noinline_for_stack noinline