diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 19:47:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 19:47:22 -0500 |
| commit | 9073e1a804c3096eda84ee7cbf11d1f174236c75 (patch) | |
| tree | 2f1b488b606bc03f8c5ce133f9158196fef07cd2 /init | |
| parent | 4937e2a6f939a41bf811378e80d71f68aa0950c6 (diff) | |
| parent | 2bb9936beac2eed0c1ed907f83694bc752e159d9 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"Usual earth-shaking, news-breaking, rocket science pile from
trivial.git"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits)
doc: usb: Fix typo in Documentation/usb/gadget_configs.txt
doc: add missing files to timers/00-INDEX
timekeeping: Fix some trivial typos in comments
mm: Fix some trivial typos in comments
irq: Fix some trivial typos in comments
NUMA: fix typos in Kconfig help text
mm: update 00-INDEX
doc: Documentation/DMA-attributes.txt fix typo
DRM: comment: `halve' -> `half'
Docs: Kconfig: `devlopers' -> `developers'
doc: typo on word accounting in kprobes.c in mutliple architectures
treewide: fix "usefull" typo
treewide: fix "distingush" typo
mm/Kconfig: Grammar s/an/a/
kexec: Typo s/the/then/
Documentation/kvm: Update cpuid documentation for steal time and pv eoi
treewide: Fix common typo in "identify"
__page_to_pfn: Fix typo in comment
Correct some typos for word frequency
clk: fixed-factor: Fix a trivial typo
...
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 5496f307988e..2d60611c0609 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -851,7 +851,7 @@ config NUMA_BALANCING_DEFAULT_ENABLED | |||
| 851 | default y | 851 | default y |
| 852 | depends on NUMA_BALANCING | 852 | depends on NUMA_BALANCING |
| 853 | help | 853 | help |
| 854 | If set, autonumic NUMA balancing will be enabled if running on a NUMA | 854 | If set, automatic NUMA balancing will be enabled if running on a NUMA |
| 855 | machine. | 855 | machine. |
| 856 | 856 | ||
| 857 | config NUMA_BALANCING | 857 | config NUMA_BALANCING |
| @@ -862,7 +862,7 @@ config NUMA_BALANCING | |||
| 862 | help | 862 | help |
| 863 | This option adds support for automatic NUMA aware memory/task placement. | 863 | This option adds support for automatic NUMA aware memory/task placement. |
| 864 | The mechanism is quite primitive and is based on migrating memory when | 864 | The mechanism is quite primitive and is based on migrating memory when |
| 865 | it is references to the node the task is running on. | 865 | it has references to the node the task is running on. |
| 866 | 866 | ||
| 867 | This system will be inactive on UMA systems. | 867 | This system will be inactive on UMA systems. |
| 868 | 868 | ||