aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/MSI-HOWTO.txt2
-rw-r--r--Documentation/block/biodoc.txt2
-rw-r--r--Documentation/driver-model/driver.txt2
-rw-r--r--Documentation/filesystems/befs.txt2
-rw-r--r--Documentation/filesystems/configfs/configfs.txt2
-rw-r--r--Documentation/ibm-acpi.txt2
-rw-r--r--Documentation/ide.txt2
-rw-r--r--Documentation/input/amijoy.txt4
-rw-r--r--Documentation/input/atarikbd.txt2
-rw-r--r--Documentation/input/joystick-parport.txt4
-rw-r--r--Documentation/md.txt4
-rw-r--r--Documentation/networking/driver.txt2
-rw-r--r--Documentation/networking/ip-sysctl.txt2
-rw-r--r--Documentation/networking/netif-msg.txt2
-rw-r--r--Documentation/networking/slicecom.txt4
-rw-r--r--Documentation/powerpc/booting-without-of.txt8
-rw-r--r--Documentation/powerpc/eeh-pci-error-recovery.txt2
-rw-r--r--Documentation/s390/cds.txt2
-rw-r--r--Documentation/s390/driver-model.txt2
-rw-r--r--Documentation/scsi/NinjaSCSI.txt12
-rw-r--r--Documentation/sound/alsa/Procfile.txt4
-rw-r--r--Documentation/sparc/sbus_drivers.txt2
-rw-r--r--Documentation/uml/UserModeLinux-HOWTO.txt4
-rw-r--r--Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt2
-rw-r--r--Documentation/video4linux/hauppauge-wintv-cx88-ir.txt2
-rw-r--r--Documentation/x86_64/boot-options.txt2
26 files changed, 40 insertions, 40 deletions
diff --git a/Documentation/MSI-HOWTO.txt b/Documentation/MSI-HOWTO.txt
index 3ec6c720b016..c70306abb7b2 100644
--- a/Documentation/MSI-HOWTO.txt
+++ b/Documentation/MSI-HOWTO.txt
@@ -267,7 +267,7 @@ y = The number of MSI capable devices populated in the system.
267 vector reserved to avoid the case where some MSI-X capable 267 vector reserved to avoid the case where some MSI-X capable
268 drivers may attempt to claim all available vector resources. 268 drivers may attempt to claim all available vector resources.
269 269
270z = The number of MSI-X capable devices pupulated in the system. 270z = The number of MSI-X capable devices populated in the system.
271 This policy ensures that maximum (x - y) is distributed 271 This policy ensures that maximum (x - y) is distributed
272 evenly among MSI-X capable devices. 272 evenly among MSI-X capable devices.
273 273
diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt
index 3646a0aaea82..c41a3e1b4b39 100644
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
@@ -783,7 +783,7 @@ all the outstanding requests. There's a third helper to do that:
783 783
784 blk_queue_invalidate_tags(request_queue_t *q) 784 blk_queue_invalidate_tags(request_queue_t *q)
785 785
786 Clear the internal block tag queue and readd all the pending requests 786 Clear the internal block tag queue and re-add all the pending requests
787 to the request queue. The driver will receive them again on the 787 to the request queue. The driver will receive them again on the
788 next request_fn run, just like it did the first time it encountered 788 next request_fn run, just like it did the first time it encountered
789 them. 789 them.
diff --git a/Documentation/driver-model/driver.txt b/Documentation/driver-model/driver.txt
index 59806c9761f7..82132169d47a 100644
--- a/Documentation/driver-model/driver.txt
+++ b/Documentation/driver-model/driver.txt
@@ -178,7 +178,7 @@ the driver to that device.
178 178
179A driver's probe() may return a negative errno value to indicate that 179A driver's probe() may return a negative errno value to indicate that
180the driver did not bind to this device, in which case it should have 180the driver did not bind to this device, in which case it should have
181released all reasources it allocated. 181released all resources it allocated.
182 182
183 int (*remove) (struct device * dev); 183 int (*remove) (struct device * dev);
184 184
diff --git a/Documentation/filesystems/befs.txt b/Documentation/filesystems/befs.txt
index e7aa177e5422..67391a15949a 100644
--- a/Documentation/filesystems/befs.txt
+++ b/Documentation/filesystems/befs.txt
@@ -7,7 +7,7 @@ WARNING
7Make sure you understand that this is alpha software. This means that the 7Make sure you understand that this is alpha software. This means that the
8implementation is neither complete nor well-tested. 8implementation is neither complete nor well-tested.
9 9
10I DISCLAIM ALL RESPONSIBILTY FOR ANY POSSIBLE BAD EFFECTS OF THIS CODE! 10I DISCLAIM ALL RESPONSIBILITY FOR ANY POSSIBLE BAD EFFECTS OF THIS CODE!
11 11
12LICENSE 12LICENSE
13===== 13=====
diff --git a/Documentation/filesystems/configfs/configfs.txt b/Documentation/filesystems/configfs/configfs.txt
index 1a6d45930ebc..8bf0369dcfb7 100644
--- a/Documentation/filesystems/configfs/configfs.txt
+++ b/Documentation/filesystems/configfs/configfs.txt
@@ -422,7 +422,7 @@ support mkdir(2) or rmdir(2) either. It only allows rename(2). The
422"pending" directory does allow mkdir(2) and rmdir(2). An item is 422"pending" directory does allow mkdir(2) and rmdir(2). An item is
423created in the "pending" directory. Its attributes can be modified at 423created in the "pending" directory. Its attributes can be modified at
424will. Userspace commits the item by renaming it into the "live" 424will. Userspace commits the item by renaming it into the "live"
425directory. At this point, the subsystem recieves the ->commit_item() 425directory. At this point, the subsystem receives the ->commit_item()
426callback. If all required attributes are filled to satisfaction, the 426callback. If all required attributes are filled to satisfaction, the
427method returns zero and the item is moved to the "live" directory. 427method returns zero and the item is moved to the "live" directory.
428 428
diff --git a/Documentation/ibm-acpi.txt b/Documentation/ibm-acpi.txt
index 8b3fd82b2ce7..71aa40345272 100644
--- a/Documentation/ibm-acpi.txt
+++ b/Documentation/ibm-acpi.txt
@@ -450,7 +450,7 @@ his laptop (the location of sensors may vary on other models):
450 450
451No commands can be written to this file. 451No commands can be written to this file.
452 452
453EXPERIMENTAL: Embedded controller reigster dump -- /proc/acpi/ibm/ecdump 453EXPERIMENTAL: Embedded controller register dump -- /proc/acpi/ibm/ecdump
454------------------------------------------------------------------------ 454------------------------------------------------------------------------
455 455
456This feature is marked EXPERIMENTAL because the implementation 456This feature is marked EXPERIMENTAL because the implementation
diff --git a/Documentation/ide.txt b/Documentation/ide.txt
index 29866fbfb229..0bf38baa2db9 100644
--- a/Documentation/ide.txt
+++ b/Documentation/ide.txt
@@ -281,7 +281,7 @@ Summary of ide driver parameters for kernel command line
281 281
282 "idex=serialize" : do not overlap operations on idex. Please note 282 "idex=serialize" : do not overlap operations on idex. Please note
283 that you will have to specify this option for 283 that you will have to specify this option for
284 both the respecitve primary and secondary channel 284 both the respective primary and secondary channel
285 to take effect. 285 to take effect.
286 286
287 "idex=four" : four drives on idex and ide(x^1) share same ports 287 "idex=four" : four drives on idex and ide(x^1) share same ports
diff --git a/Documentation/input/amijoy.txt b/Documentation/input/amijoy.txt
index 3b8b2d43a68e..4f0e89df5c51 100644
--- a/Documentation/input/amijoy.txt
+++ b/Documentation/input/amijoy.txt
@@ -79,10 +79,10 @@ JOY0DAT Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 X7 X6 X5 X4 X3 X2 X1 X0
79JOY1DAT Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 X7 X6 X5 X4 X3 X2 X1 X0 79JOY1DAT Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 X7 X6 X5 X4 X3 X2 X1 X0
80 80
81 0=LEFT CONTROLLER PAIR, 1=RIGHT CONTROLLER PAIR. 81 0=LEFT CONTROLLER PAIR, 1=RIGHT CONTROLLER PAIR.
82 (4 counters total).The bit usage for both left and right 82 (4 counters total). The bit usage for both left and right
83 addresses is shown below. Each 6 bit counter (Y7-Y2,X7-X2) is 83 addresses is shown below. Each 6 bit counter (Y7-Y2,X7-X2) is
84 clocked by 2 of the signals input from the mouse serial 84 clocked by 2 of the signals input from the mouse serial
85 stream. Starting with first bit recived: 85 stream. Starting with first bit received:
86 86
87 +-------------------+-----------------------------------------+ 87 +-------------------+-----------------------------------------+
88 | Serial | Bit Name | Description | 88 | Serial | Bit Name | Description |
diff --git a/Documentation/input/atarikbd.txt b/Documentation/input/atarikbd.txt
index 7171fbf86fae..1e7e5853ba4c 100644
--- a/Documentation/input/atarikbd.txt
+++ b/Documentation/input/atarikbd.txt
@@ -84,7 +84,7 @@ selected.
844.2 Absolute Position reporting 844.2 Absolute Position reporting
85 85
86The ikbd can also maintain absolute mouse position. Commands exist for 86The ikbd can also maintain absolute mouse position. Commands exist for
87reseting the mouse position, setting X/Y scaling, and interrogating the 87resetting the mouse position, setting X/Y scaling, and interrogating the
88current mouse position. 88current mouse position.
89 89
904.3 Mouse Cursor Key Mode 904.3 Mouse Cursor Key Mode
diff --git a/Documentation/input/joystick-parport.txt b/Documentation/input/joystick-parport.txt
index 22f039d9da62..ede5f33daad3 100644
--- a/Documentation/input/joystick-parport.txt
+++ b/Documentation/input/joystick-parport.txt
@@ -456,8 +456,8 @@ uses the following kernel/module command line:
456 8 | Sony PSX DDR controller 456 8 | Sony PSX DDR controller
457 9 | SNES mouse 457 9 | SNES mouse
458 458
459 The exact type of the PSX controller type is autoprobed when used so 459 The exact type of the PSX controller type is autoprobed when used, so
460hot swapping should work (but is not recomended). 460hot swapping should work (but is not recommended).
461 461
462 Should you want to use more than one of parallel ports at once, you can use 462 Should you want to use more than one of parallel ports at once, you can use
463gamecon.map2 and gamecon.map3 as additional command line parameters for two 463gamecon.map2 and gamecon.map3 as additional command line parameters for two
diff --git a/Documentation/md.txt b/Documentation/md.txt
index 38589c9465f1..2202f5dc8ac2 100644
--- a/Documentation/md.txt
+++ b/Documentation/md.txt
@@ -307,8 +307,8 @@ Each directory contains:
307 This applies only to raid1 arrays. 307 This applies only to raid1 arrays.
308 spare - device is working, but not a full member. 308 spare - device is working, but not a full member.
309 This includes spares that are in the process 309 This includes spares that are in the process
310 of being recoverred to 310 of being recovered to
311 This list make grow in future. 311 This list may grow in future.
312 This can be written to. 312 This can be written to.
313 Writing "faulty" simulates a failure on the device. 313 Writing "faulty" simulates a failure on the device.
314 Writing "remove" removes the device from the array. 314 Writing "remove" removes the device from the array.
diff --git a/Documentation/networking/driver.txt b/Documentation/networking/driver.txt
index a9ad58b49cc5..4f7da5a2bf4f 100644
--- a/Documentation/networking/driver.txt
+++ b/Documentation/networking/driver.txt
@@ -37,7 +37,7 @@ Transmit path guidelines:
37 ... 37 ...
38 } 38 }
39 39
40 And then at the end of your TX reclaimation event handling: 40 And then at the end of your TX reclamation event handling:
41 41
42 if (netif_queue_stopped(dp->dev) && 42 if (netif_queue_stopped(dp->dev) &&
43 TX_BUFFS_AVAIL(dp) > (MAX_SKB_FRAGS + 1)) 43 TX_BUFFS_AVAIL(dp) > (MAX_SKB_FRAGS + 1))
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 912e2496b70b..fd3c0c012351 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -495,7 +495,7 @@ icmp_errors_use_inbound_ifaddr - BOOLEAN
495 495
496 Note that if no primary address exists for the interface selected, 496 Note that if no primary address exists for the interface selected,
497 then the primary address of the first non-loopback interface that 497 then the primary address of the first non-loopback interface that
498 has one will be used regarldess of this setting. 498 has one will be used regardless of this setting.
499 499
500 Default: 0 500 Default: 0
501 501
diff --git a/Documentation/networking/netif-msg.txt b/Documentation/networking/netif-msg.txt
index 18ad4cea6259..c967ddb90d0b 100644
--- a/Documentation/networking/netif-msg.txt
+++ b/Documentation/networking/netif-msg.txt
@@ -40,7 +40,7 @@ History
40 Per-interface rather than per-driver message level setting. 40 Per-interface rather than per-driver message level setting.
41 More selective control over the type of messages emitted. 41 More selective control over the type of messages emitted.
42 42
43 The netif_msg recommandation adds these features with only a minor 43 The netif_msg recommendation adds these features with only a minor
44 complexity and code size increase. 44 complexity and code size increase.
45 45
46 The recommendation is the following points 46 The recommendation is the following points
diff --git a/Documentation/networking/slicecom.txt b/Documentation/networking/slicecom.txt
index 59cfd95121fb..5fb21d5d46f0 100644
--- a/Documentation/networking/slicecom.txt
+++ b/Documentation/networking/slicecom.txt
@@ -89,7 +89,7 @@ red: green: meaning:
89 89
90- - no frame-sync, no signal received, or signal SNAFU. 90- - no frame-sync, no signal received, or signal SNAFU.
91- on "Everything is OK" 91- on "Everything is OK"
92on on Recepion is ok, but the remote end sends Remote Alarm 92on on Reception is ok, but the remote end sends Remote Alarm
93on - The interface is unconfigured 93on - The interface is unconfigured
94 94
95----------------------------------------------------------------- 95-----------------------------------------------------------------
@@ -257,7 +257,7 @@ which begin with '//' are the comments.
257// No alarms - Everything OK 257// No alarms - Everything OK
258// 258//
259// LOS - Loss Of Signal - No signal sensed on the input 259// LOS - Loss Of Signal - No signal sensed on the input
260// AIS - Alarm Indication Signal - The remot side sends '11111111'-s, 260// AIS - Alarm Indication Signal - The remote side sends '11111111'-s,
261// it tells, that there's an error condition, or it's not 261// it tells, that there's an error condition, or it's not
262// initialised. 262// initialised.
263// AUXP - Auxiliary Pattern Indication - 01010101.. received. 263// AUXP - Auxiliary Pattern Indication - 01010101.. received.
diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt
index ee272035f781..8ca9a563e221 100644
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
@@ -245,7 +245,7 @@ the block to RAM before passing it to the kernel.
245--------- 245---------
246 246
247 The kernel is entered with r3 pointing to an area of memory that is 247 The kernel is entered with r3 pointing to an area of memory that is
248 roughtly described in include/asm-powerpc/prom.h by the structure 248 roughly described in include/asm-powerpc/prom.h by the structure
249 boot_param_header: 249 boot_param_header:
250 250
251struct boot_param_header { 251struct boot_param_header {
@@ -1068,13 +1068,13 @@ while all this has been defined and implemented.
1068 around. It contains no internal offsets or pointers for this 1068 around. It contains no internal offsets or pointers for this
1069 purpose. 1069 purpose.
1070 1070
1071 - An example of code for iterating nodes & retreiving properties 1071 - An example of code for iterating nodes & retrieving properties
1072 directly from the flattened tree format can be found in the kernel 1072 directly from the flattened tree format can be found in the kernel
1073 file arch/ppc64/kernel/prom.c, look at scan_flat_dt() function, 1073 file arch/ppc64/kernel/prom.c, look at scan_flat_dt() function,
1074 it's usage in early_init_devtree(), and the corresponding various 1074 its usage in early_init_devtree(), and the corresponding various
1075 early_init_dt_scan_*() callbacks. That code can be re-used in a 1075 early_init_dt_scan_*() callbacks. That code can be re-used in a
1076 GPL bootloader, and as the author of that code, I would be happy 1076 GPL bootloader, and as the author of that code, I would be happy
1077 do discuss possible free licencing to any vendor who wishes to 1077 to discuss possible free licencing to any vendor who wishes to
1078 integrate all or part of this code into a non-GPL bootloader. 1078 integrate all or part of this code into a non-GPL bootloader.
1079 1079
1080 1080
diff --git a/Documentation/powerpc/eeh-pci-error-recovery.txt b/Documentation/powerpc/eeh-pci-error-recovery.txt
index be8867d03db8..4530d1bf0286 100644
--- a/Documentation/powerpc/eeh-pci-error-recovery.txt
+++ b/Documentation/powerpc/eeh-pci-error-recovery.txt
@@ -90,7 +90,7 @@ EEH-isolated, there is a firmware call it can make to determine if
90this is the case. If so, then the device driver should put itself 90this is the case. If so, then the device driver should put itself
91into a consistent state (given that it won't be able to complete any 91into a consistent state (given that it won't be able to complete any
92pending work) and start recovery of the card. Recovery normally 92pending work) and start recovery of the card. Recovery normally
93would consist of reseting the PCI device (holding the PCI #RST 93would consist of resetting the PCI device (holding the PCI #RST
94line high for two seconds), followed by setting up the device 94line high for two seconds), followed by setting up the device
95config space (the base address registers (BAR's), latency timer, 95config space (the base address registers (BAR's), latency timer,
96cache line size, interrupt line, and so on). This is followed by a 96cache line size, interrupt line, and so on). This is followed by a
diff --git a/Documentation/s390/cds.txt b/Documentation/s390/cds.txt
index 265a313456ee..d80e5733827d 100644
--- a/Documentation/s390/cds.txt
+++ b/Documentation/s390/cds.txt
@@ -133,7 +133,7 @@ determine the device driver owning the device that raised the interrupt.
133In order not to introduce a new I/O concept to the common Linux code, 133In order not to introduce a new I/O concept to the common Linux code,
134Linux/390 preserves the IRQ concept and semantically maps the ESA/390 134Linux/390 preserves the IRQ concept and semantically maps the ESA/390
135subchannels to Linux as IRQs. This allows Linux/390 to support up to 64k 135subchannels to Linux as IRQs. This allows Linux/390 to support up to 64k
136different IRQs, uniquely representig a single device each. 136different IRQs, uniquely representing a single device each.
137 137
138Up to kernel 2.4, Linux/390 used to provide interfaces via the IRQ (subchannel). 138Up to kernel 2.4, Linux/390 used to provide interfaces via the IRQ (subchannel).
139For internal use of the common I/O layer, these are still there. However, 139For internal use of the common I/O layer, these are still there. However,
diff --git a/Documentation/s390/driver-model.txt b/Documentation/s390/driver-model.txt
index 5295a835d55d..62c082387aea 100644
--- a/Documentation/s390/driver-model.txt
+++ b/Documentation/s390/driver-model.txt
@@ -157,7 +157,7 @@ notify: This function is called by the common I/O layer for some state changes
157 * In online state, device detached (CIO_GONE) or last path gone 157 * In online state, device detached (CIO_GONE) or last path gone
158 (CIO_NO_PATH). The driver must return !0 to keep the device; for 158 (CIO_NO_PATH). The driver must return !0 to keep the device; for
159 return code 0, the device will be deleted as usual (also when no 159 return code 0, the device will be deleted as usual (also when no
160 notify function is registerd). If the driver wants to keep the 160 notify function is registered). If the driver wants to keep the
161 device, it is moved into disconnected state. 161 device, it is moved into disconnected state.
162 * In disconnected state, device operational again (CIO_OPER). The 162 * In disconnected state, device operational again (CIO_OPER). The
163 common I/O layer performs some sanity checks on device number and 163 common I/O layer performs some sanity checks on device number and
diff --git a/Documentation/scsi/NinjaSCSI.txt b/Documentation/scsi/NinjaSCSI.txt
index 73cec1211d7b..3229b64cf24e 100644
--- a/Documentation/scsi/NinjaSCSI.txt
+++ b/Documentation/scsi/NinjaSCSI.txt
@@ -36,18 +36,18 @@ Socket 1:
36 product info: "IO DATA", "CBSC16 ", "1" 36 product info: "IO DATA", "CBSC16 ", "1"
37 37
38 38
39[2] Get Linux kernel source, and extract it to /usr/src. 39[2] Get the Linux kernel source, and extract it to /usr/src.
40 Because NinjaSCSI driver requiers some SCSI header files in Linux kernel 40 Because the NinjaSCSI driver requires some SCSI header files in Linux
41 source. 41 kernel source, I recommend rebuilding your kernel; this eliminates
42 I recomend rebuilding your kernel. This eliminate some versioning problem. 42 some versioning problems.
43$ cd /usr/src 43$ cd /usr/src
44$ tar -zxvf linux-x.x.x.tar.gz 44$ tar -zxvf linux-x.x.x.tar.gz
45$ cd linux 45$ cd linux
46$ make config 46$ make config
47... 47...
48 48
49[3] If you use this driver with Kernel 2.2, Unpack pcmcia-cs in some directory 49[3] If you use this driver with Kernel 2.2, unpack pcmcia-cs in some directory
50 and make & install. This driver requies pcmcia-cs header file. 50 and make & install. This driver requires the pcmcia-cs header file.
51$ cd /usr/src 51$ cd /usr/src
52$ tar zxvf cs-pcmcia-cs-3.x.x.tar.gz 52$ tar zxvf cs-pcmcia-cs-3.x.x.tar.gz
53... 53...
diff --git a/Documentation/sound/alsa/Procfile.txt b/Documentation/sound/alsa/Procfile.txt
index b1386168f6a9..18f04bd1b9a0 100644
--- a/Documentation/sound/alsa/Procfile.txt
+++ b/Documentation/sound/alsa/Procfile.txt
@@ -182,10 +182,10 @@ When the problem is related with PCM, first try to turn on xrun_debug
182mode. This will give you the kernel messages when and where xrun 182mode. This will give you the kernel messages when and where xrun
183happened. 183happened.
184 184
185If it's really a bug, report it with the following information 185If it's really a bug, report it with the following information:
186 186
187 - the name of the driver/card, show in /proc/asound/cards 187 - the name of the driver/card, show in /proc/asound/cards
188 - the reigster dump, if available (e.g. card*/cmipci) 188 - the register dump, if available (e.g. card*/cmipci)
189 189
190when it's a PCM problem, 190when it's a PCM problem,
191 191
diff --git a/Documentation/sparc/sbus_drivers.txt b/Documentation/sparc/sbus_drivers.txt
index 7ac0695cba59..8418d35484fc 100644
--- a/Documentation/sparc/sbus_drivers.txt
+++ b/Documentation/sparc/sbus_drivers.txt
@@ -98,7 +98,7 @@ in your .remove method.
98 98
99 Any memory allocated, registers mapped, IRQs registered, 99 Any memory allocated, registers mapped, IRQs registered,
100etc. must be undone by your .remove method so that all resources 100etc. must be undone by your .remove method so that all resources
101of your device are relased by the time it returns. 101of your device are released by the time it returns.
102 102
103 You should _NOT_ use the for_each_sbus(), for_each_sbusdev(), 103 You should _NOT_ use the for_each_sbus(), for_each_sbusdev(),
104and for_all_sbusdev() interfaces. They are deprecated, will be 104and for_all_sbusdev() interfaces. They are deprecated, will be
diff --git a/Documentation/uml/UserModeLinux-HOWTO.txt b/Documentation/uml/UserModeLinux-HOWTO.txt
index d9c8c11e4710..b60590eca18f 100644
--- a/Documentation/uml/UserModeLinux-HOWTO.txt
+++ b/Documentation/uml/UserModeLinux-HOWTO.txt
@@ -3903,9 +3903,9 @@
3903 3903
3904 1133..55.. UUMMLL ddooeessnn''tt wwoorrkk wwhheenn //ttmmpp iiss aann NNFFSS ffiilleessyysstteemm 3904 1133..55.. UUMMLL ddooeessnn''tt wwoorrkk wwhheenn //ttmmpp iiss aann NNFFSS ffiilleessyysstteemm
3905 3905
3906 This seems to be a similar situation with the resierfs problem above. 3906 This seems to be a similar situation with the ReiserFS problem above.
3907 Some versions of NFS seems not to handle mmap correctly, which UML 3907 Some versions of NFS seems not to handle mmap correctly, which UML
3908 depends on. The workaround is have /tmp be non-NFS directory. 3908 depends on. The workaround is have /tmp be a non-NFS directory.
3909 3909
3910 3910
3911 1133..66.. UUMMLL hhaannggss oonn bboooott wwhheenn ccoommppiilleedd wwiitthh ggpprrooff ssuuppppoorrtt 3911 1133..66.. UUMMLL hhaannggss oonn bboooott wwhheenn ccoommppiilleedd wwiitthh ggpprrooff ssuuppppoorrtt
diff --git a/Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt b/Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt
index 93fec32a1188..faccee68f603 100644
--- a/Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt
+++ b/Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt
@@ -30,7 +30,7 @@ provide for a handler)
30GP_SAMPLE register is at 0x35C058 30GP_SAMPLE register is at 0x35C058
31 31
32Bits are then right shifted into the GP_SAMPLE register at the specified 32Bits are then right shifted into the GP_SAMPLE register at the specified
33rate; you get an interrupt when a full DWORD is recieved. 33rate; you get an interrupt when a full DWORD is received.
34You need to recover the actual RC5 bits out of the (oversampled) IR sensor 34You need to recover the actual RC5 bits out of the (oversampled) IR sensor
35bits. (Hint: look for the 0/1and 1/0 crossings of the RC5 bi-phase data) An 35bits. (Hint: look for the 0/1and 1/0 crossings of the RC5 bi-phase data) An
36actual raw RC5 code will span 2-3 DWORDS, depending on the actual alignment. 36actual raw RC5 code will span 2-3 DWORDS, depending on the actual alignment.
diff --git a/Documentation/video4linux/hauppauge-wintv-cx88-ir.txt b/Documentation/video4linux/hauppauge-wintv-cx88-ir.txt
index 93fec32a1188..faccee68f603 100644
--- a/Documentation/video4linux/hauppauge-wintv-cx88-ir.txt
+++ b/Documentation/video4linux/hauppauge-wintv-cx88-ir.txt
@@ -30,7 +30,7 @@ provide for a handler)
30GP_SAMPLE register is at 0x35C058 30GP_SAMPLE register is at 0x35C058
31 31
32Bits are then right shifted into the GP_SAMPLE register at the specified 32Bits are then right shifted into the GP_SAMPLE register at the specified
33rate; you get an interrupt when a full DWORD is recieved. 33rate; you get an interrupt when a full DWORD is received.
34You need to recover the actual RC5 bits out of the (oversampled) IR sensor 34You need to recover the actual RC5 bits out of the (oversampled) IR sensor
35bits. (Hint: look for the 0/1and 1/0 crossings of the RC5 bi-phase data) An 35bits. (Hint: look for the 0/1and 1/0 crossings of the RC5 bi-phase data) An
36actual raw RC5 code will span 2-3 DWORDS, depending on the actual alignment. 36actual raw RC5 code will span 2-3 DWORDS, depending on the actual alignment.
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt
index 74b77f9e91bc..f3c57f43ba64 100644
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
@@ -109,7 +109,7 @@ Idle loop
109Rebooting 109Rebooting
110 110
111 reboot=b[ios] | t[riple] | k[bd] [, [w]arm | [c]old] 111 reboot=b[ios] | t[riple] | k[bd] [, [w]arm | [c]old]
112 bios Use the CPU reboto vector for warm reset 112 bios Use the CPU reboot vector for warm reset
113 warm Don't set the cold reboot flag 113 warm Don't set the cold reboot flag
114 cold Set the cold reboot flag 114 cold Set the cold reboot flag
115 triple Force a triple fault (init) 115 triple Force a triple fault (init)