diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 13:37:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 13:37:40 -0400 |
commit | e16b396ce314b2bcdfe6c173fe075bf8e3432368 (patch) | |
tree | 640f0f56f2ea676647af4eb42d32fa56be2ee549 /Documentation/sysctl | |
parent | 7fd23a24717a327a66f3c32d11a20a2f169c824f (diff) | |
parent | e6e8dd5055a974935af1398c8648d4a9359b0ecb (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)
doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
Update cpuset info & webiste for cgroups
dcdbas: force SMI to happen when expected
arch/arm/Kconfig: remove one to many l's in the word.
asm-generic/user.h: Fix spelling in comment
drm: fix printk typo 'sracth'
Remove one to many n's in a word
Documentation/filesystems/romfs.txt: fixing link to genromfs
drivers:scsi Change printk typo initate -> initiate
serial, pch uart: Remove duplicate inclusion of linux/pci.h header
fs/eventpoll.c: fix spelling
mm: Fix out-of-date comments which refers non-existent functions
drm: Fix printk typo 'failled'
coh901318.c: Change initate to initiate.
mbox-db5500.c Change initate to initiate.
edac: correct i82975x error-info reported
edac: correct i82975x mci initialisation
edac: correct commented info
fs: update comments to point correct document
target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
...
Trivial conflict in fs/eventpoll.c (spelling vs addition)
Diffstat (limited to 'Documentation/sysctl')
-rw-r--r-- | Documentation/sysctl/kernel.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt index 11d5ceda5bb0..36f007514db3 100644 --- a/Documentation/sysctl/kernel.txt +++ b/Documentation/sysctl/kernel.txt | |||
@@ -367,7 +367,7 @@ the different loglevels. | |||
367 | 367 | ||
368 | - console_loglevel: messages with a higher priority than | 368 | - console_loglevel: messages with a higher priority than |
369 | this will be printed to the console | 369 | this will be printed to the console |
370 | - default_message_level: messages without an explicit priority | 370 | - default_message_loglevel: messages without an explicit priority |
371 | will be printed with this priority | 371 | will be printed with this priority |
372 | - minimum_console_loglevel: minimum (highest) value to which | 372 | - minimum_console_loglevel: minimum (highest) value to which |
373 | console_loglevel can be set | 373 | console_loglevel can be set |