diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-28 14:22:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-28 14:22:25 -0700 |
| commit | 69c4289449b954f87ce33904bbb1b27dc075dcfa (patch) | |
| tree | 281d93b5b3d65e832e2fe8e7ff77d89a7de7539b /init | |
| parent | 76d5b28bbad1c5502a24f94c2beafc468690b2ba (diff) | |
| parent | 34df117414d73cb56d128bf7016a4c151f95c313 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
fat: fix error message for bogus number of directory entries
fat: fix typo s/supeblock/superblock/
ASoC: max9877: Remove unused function declaration
dw2102: don't output spurious blank lines to the kernel log
init: fix Kconfig text
ARM: io: fix comment grammar
ocfs: fix ocfs2_xattr_user_get() argument name
scsi/qla2xxx: Remove erroneous unused macro qla82xx_get_temp_val1()
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index 504057925ee9..46f817abff0e 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -852,8 +852,8 @@ config LOG_CPU_MAX_BUF_SHIFT used as it forces an exact (power of two) size of the ring buffer. The number of possible CPUs is used for this computation ignoring - hotplugging making the compuation optimal for the the worst case - scenerio while allowing a simple algorithm to be used from bootup. + hotplugging making the computation optimal for the worst case + scenario while allowing a simple algorithm to be used from bootup. Examples shift values and their meaning: 17 => 128 KB for each CPU |