diff --git a/[refs] b/[refs] index 7d4937ee4576..6e1203bac361 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f3a9508b5778034091e00e696dc17ca98b8a84c +refs/heads/master: 06b0f574eafdd26d325ce5ab3c38522d0cdd7b7c diff --git a/trunk/include/asm-x86/string_32.h b/trunk/include/asm-x86/string_32.h index c5d13a86dea7..b49369ad9a61 100644 --- a/trunk/include/asm-x86/string_32.h +++ b/trunk/include/asm-x86/string_32.h @@ -3,7 +3,7 @@ #ifdef __KERNEL__ -/* Let gcc decide wether to inline or use the out of line functions */ +/* Let gcc decide whether to inline or use the out of line functions */ #define __HAVE_ARCH_STRCPY extern char *strcpy(char *dest, const char *src);