diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-12 21:51:51 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-12 21:51:51 -0500 |
commit | 775ba7ad491a154f99871fe603f03366e84ae159 (patch) | |
tree | 7112bd513ff7c60033f4ba07790cab8a7d3195a2 /include/linux/sysctl.h | |
parent | d9405057c18cdc62eade7106a774d87a3e080875 (diff) | |
parent | 18b36c7119aa868fdfae6855b86824db238e5ebc (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
Fix inotify maintainers entry
Fix typo in new debug options.
Jon needs a new shift key.
fs: Convert kmalloc() + memset() to kzalloc() in fs/.
configfs.h: Remove dead macro definitions.
kconfig: Standardize "depends" -> "depends on" in Kconfig files
e100: replace kmalloc with kcalloc
um: replace kmalloc+memset with kzalloc
fix typo in net/ipv4/ip_fragment.c
include/linux/compiler.h: reject gcc 3 < gcc 3.2
Kconfig: fix spelling error in config KALLSYMS help text
Remove duplicate "have to" in comment
Fix small typo in drivers/serial/icom.c
Use consistent casing in help message
EXT{2,3,4}_FS: remove outdated part of the help text
Diffstat (limited to 'include/linux/sysctl.h')
-rw-r--r-- | include/linux/sysctl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 6d8846e7be6d..81480e613467 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h | |||
@@ -11,7 +11,7 @@ | |||
11 | ** the sysctl() binary interface. Do *NOT* change the | 11 | ** the sysctl() binary interface. Do *NOT* change the |
12 | ** numbering of any existing values here, and do not change | 12 | ** numbering of any existing values here, and do not change |
13 | ** any numbers within any one set of values. If you have to | 13 | ** any numbers within any one set of values. If you have to |
14 | ** have to redefine an existing interface, use a new number for it. | 14 | ** redefine an existing interface, use a new number for it. |
15 | ** The kernel will then return -ENOTDIR to any application using | 15 | ** The kernel will then return -ENOTDIR to any application using |
16 | ** the old binary interface. | 16 | ** the old binary interface. |
17 | ** | 17 | ** |