summaryrefslogtreecommitdiffstats
path: root/arch/x86/lib
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-03-17 09:44:57 +0100
committerIngo Molnar <mingo@kernel.org>2016-03-17 09:44:57 +0100
commit00f526850151e91fdad0896a1436341687ad2582 (patch)
tree67c28260020440ade83d6f4aa003ae4f0c683e67 /arch/x86/lib
parentcbf8b5a2b649a501758291cb4d4ba1e5711771ba (diff)
parentd89abe2a1f0c92499eedc815e4a9b2881f4959a5 (diff)
downloadlinux-00f526850151e91fdad0896a1436341687ad2582.tar.gz
linux-00f526850151e91fdad0896a1436341687ad2582.tar.bz2
linux-00f526850151e91fdad0896a1436341687ad2582.zip
Merge branch 'x86/cleanups' into x86/urgent
Pull in some merge window leftovers. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/lib')
-rw-r--r--arch/x86/lib/memset_64.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
index c9c81227ea37..e1229ecd2a82 100644
--- a/arch/x86/lib/memset_64.S
+++ b/arch/x86/lib/memset_64.S
@@ -9,7 +9,7 @@
/*
* ISO C memset - set a memory block to a byte value. This function uses fast
* string to get better performance than the original function. The code is
- * simpler and shorter than the orignal function as well.
+ * simpler and shorter than the original function as well.
*
* rdi destination
* rsi value (char)