aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/string.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-10 09:16:27 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-10 09:16:27 +0100
commit4ecd33d930591d41fe356160593a9076467b961c (patch)
treeb9051a334540bbce38db1b2b03cebb4cf1d51f73 /include/linux/string.h
parentx86, NMI watchdog: disable NMIs on LVT0 in case NMI watchdog is not working (diff)
parentLinux 2.6.28-rc4 (diff)
downloadlinux-dev-4ecd33d930591d41fe356160593a9076467b961c.tar.xz
linux-dev-4ecd33d930591d41fe356160593a9076467b961c.zip
Merge commit 'v2.6.28-rc4' into x86/apic
Diffstat (limited to 'include/linux/string.h')
-rw-r--r--include/linux/string.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/string.h b/include/linux/string.h
index 810d80df0a1d..d18fc198aa2f 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -1,7 +1,7 @@
#ifndef _LINUX_STRING_H_
#define _LINUX_STRING_H_
-/* We don't want strings.h stuff being user by user stuff by accident */
+/* We don't want strings.h stuff being used by user stuff by accident */
#ifndef __KERNEL__
#include <string.h>