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 | |
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')
-rw-r--r-- | Documentation/devicetree/bindings/powerpc/nintendo/wii.txt | 2 | ||||
-rw-r--r-- | Documentation/feature-removal-schedule.txt | 2 | ||||
-rw-r--r-- | Documentation/stable_api_nonsense.txt | 2 | ||||
-rw-r--r-- | Documentation/sysctl/vm.txt | 4 | ||||
-rw-r--r-- | Documentation/timers/timers-howto.txt | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/powerpc/nintendo/wii.txt b/Documentation/devicetree/bindings/powerpc/nintendo/wii.txt index a7e155a023b8..36afa322b04b 100644 --- a/Documentation/devicetree/bindings/powerpc/nintendo/wii.txt +++ b/Documentation/devicetree/bindings/powerpc/nintendo/wii.txt | |||
@@ -127,7 +127,7 @@ Nintendo Wii device tree | |||
127 | - reg : should contain the SDHCI registers location and length | 127 | - reg : should contain the SDHCI registers location and length |
128 | - interrupts : should contain the SDHCI interrupt | 128 | - interrupts : should contain the SDHCI interrupt |
129 | 129 | ||
130 | 1.j) The Inter-Processsor Communication (IPC) node | 130 | 1.j) The Inter-Processor Communication (IPC) node |
131 | 131 | ||
132 | Represent the Inter-Processor Communication interface. This interface | 132 | Represent the Inter-Processor Communication interface. This interface |
133 | enables communications between the Broadway and the Starlet processors. | 133 | enables communications between the Broadway and the Starlet processors. |
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 4cba260e3059..19132cadc18d 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
@@ -215,7 +215,7 @@ Who: Zhang Rui <rui.zhang@intel.com> | |||
215 | What: CONFIG_ACPI_PROCFS_POWER | 215 | What: CONFIG_ACPI_PROCFS_POWER |
216 | When: 2.6.39 | 216 | When: 2.6.39 |
217 | Why: sysfs I/F for ACPI power devices, including AC and Battery, | 217 | Why: sysfs I/F for ACPI power devices, including AC and Battery, |
218 | has been working in upstream kenrel since 2.6.24, Sep 2007. | 218 | has been working in upstream kernel since 2.6.24, Sep 2007. |
219 | In 2.6.37, we make the sysfs I/F always built in and this option | 219 | In 2.6.37, we make the sysfs I/F always built in and this option |
220 | disabled by default. | 220 | disabled by default. |
221 | Remove this option and the ACPI power procfs interface in 2.6.39. | 221 | Remove this option and the ACPI power procfs interface in 2.6.39. |
diff --git a/Documentation/stable_api_nonsense.txt b/Documentation/stable_api_nonsense.txt index 847b342b7b20..db3be892afb2 100644 --- a/Documentation/stable_api_nonsense.txt +++ b/Documentation/stable_api_nonsense.txt | |||
@@ -122,7 +122,7 @@ operating system to suffer. | |||
122 | 122 | ||
123 | In both of these instances, all developers agreed that these were | 123 | In both of these instances, all developers agreed that these were |
124 | important changes that needed to be made, and they were made, with | 124 | important changes that needed to be made, and they were made, with |
125 | relatively little pain. If Linux had to ensure that it preserve a | 125 | relatively little pain. If Linux had to ensure that it will preserve a |
126 | stable source interface, a new interface would have been created, and | 126 | stable source interface, a new interface would have been created, and |
127 | the older, broken one would have had to be maintained over time, leading | 127 | the older, broken one would have had to be maintained over time, leading |
128 | to extra work for the USB developers. Since all Linux USB developers do | 128 | to extra work for the USB developers. Since all Linux USB developers do |
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. |
diff --git a/Documentation/timers/timers-howto.txt b/Documentation/timers/timers-howto.txt index c9ef29d2ede3..038f8c77a076 100644 --- a/Documentation/timers/timers-howto.txt +++ b/Documentation/timers/timers-howto.txt | |||
@@ -24,7 +24,7 @@ ATOMIC CONTEXT: | |||
24 | 24 | ||
25 | ndelay(unsigned long nsecs) | 25 | ndelay(unsigned long nsecs) |
26 | udelay(unsigned long usecs) | 26 | udelay(unsigned long usecs) |
27 | mdelay(unsgined long msecs) | 27 | mdelay(unsigned long msecs) |
28 | 28 | ||
29 | udelay is the generally preferred API; ndelay-level | 29 | udelay is the generally preferred API; ndelay-level |
30 | precision may not actually exist on many non-PC devices. | 30 | precision may not actually exist on many non-PC devices. |