diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
| commit | 57d19e80f459dd845fb3cfeba8e6df8471bac142 (patch) | |
| tree | 8254766715720228db3d50f1ef3c7fe003c06d65 /Documentation/sysctl | |
| parent | ee9ec4f82049c678373a611ce20ac67fe9ad836e (diff) | |
| parent | e64851f5a0ad6ec991f74ebb3108c35aa0323d5f (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: (39 commits)
b43: fix comment typo reqest -> request
Haavard Skinnemoen has left Atmel
cris: typo in mach-fs Makefile
Kconfig: fix copy/paste-ism for dell-wmi-aio driver
doc: timers-howto: fix a typo ("unsgined")
perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
treewide: fix a few typos in comments
regulator: change debug statement be consistent with the style of the rest
Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
audit: acquire creds selectively to reduce atomic op overhead
rtlwifi: don't touch with treewide double semicolon removal
treewide: cleanup continuations and remove logging message whitespace
ath9k_hw: don't touch with treewide double semicolon removal
include/linux/leds-regulator.h: fix syntax in example code
tty: fix typo in descripton of tty_termios_encode_baud_rate
xtensa: remove obsolete BKL kernel option from defconfig
m68k: fix comment typo 'occcured'
arch:Kconfig.locks Remove unused config option.
treewide: remove extra semicolons
...
Diffstat (limited to 'Documentation/sysctl')
| -rw-r--r-- | Documentation/sysctl/vm.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt index 30289fab86eb..96f0ee825bed 100644 --- a/Documentation/sysctl/vm.txt +++ b/Documentation/sysctl/vm.txt | |||
| @@ -481,10 +481,10 @@ the DMA zone. | |||
| 481 | Type(A) is called as "Node" order. Type (B) is "Zone" order. | 481 | Type(A) is called as "Node" order. Type (B) is "Zone" order. |
| 482 | 482 | ||
| 483 | "Node order" orders the zonelists by node, then by zone within each node. | 483 | "Node order" orders the zonelists by node, then by zone within each node. |
| 484 | Specify "[Nn]ode" for zone order | 484 | Specify "[Nn]ode" for node order |
| 485 | 485 | ||
| 486 | "Zone Order" orders the zonelists by zone type, then by node within each | 486 | "Zone Order" orders the zonelists by zone type, then by node within each |
| 487 | zone. Specify "[Zz]one"for zode order. | 487 | zone. Specify "[Zz]one" for zone order. |
| 488 | 488 | ||
| 489 | Specify "[Dd]efault" to request automatic configuration. Autoconfiguration | 489 | Specify "[Dd]efault" to request automatic configuration. Autoconfiguration |
| 490 | will select "node" order in following case. | 490 | will select "node" order in following case. |