From 58c70513754cb8655a6a481138a9f3ef8ce7a717 Mon Sep 17 00:00:00 2001
From: Matt LaPlante <kernel1@cyberdogtech.com>
Date: Tue, 3 Oct 2006 22:49:15 +0200
Subject: [PATCH] --- yaml --- r: 38308 b: refs/heads/master c:
 a2ffd2751683f4275d4d1aa5ce37e5a6a1ae21df h: refs/heads/master v: v3

---
 [refs]                                                 | 2 +-
 trunk/Documentation/block/barrier.txt                  | 2 +-
 trunk/Documentation/block/deadline-iosched.txt         | 2 +-
 trunk/Documentation/cpu-freq/cpufreq-stats.txt         | 2 +-
 trunk/Documentation/cpu-freq/governors.txt             | 2 +-
 trunk/Documentation/dell_rbu.txt                       | 4 ++--
 trunk/Documentation/dvb/faq.txt                        | 2 +-
 trunk/Documentation/fb/sisfb.txt                       | 2 +-
 trunk/Documentation/fb/sstfb.txt                       | 2 +-
 trunk/Documentation/feature-removal-schedule.txt       | 2 +-
 trunk/Documentation/filesystems/spufs.txt              | 2 +-
 trunk/Documentation/lockdep-design.txt                 | 2 +-
 trunk/Documentation/networking/cxgb.txt                | 2 +-
 trunk/Documentation/networking/fib_trie.txt            | 2 +-
 trunk/Documentation/powerpc/booting-without-of.txt     | 4 ++--
 trunk/Documentation/powerpc/eeh-pci-error-recovery.txt | 2 +-
 trunk/Documentation/powerpc/hvcs.txt                   | 2 +-
 trunk/Documentation/s390/Debugging390.txt              | 2 +-
 trunk/Documentation/s390/s390dbf.txt                   | 2 +-
 trunk/Documentation/scsi/aic7xxx_old.txt               | 2 +-
 trunk/Documentation/uml/UserModeLinux-HOWTO.txt        | 2 +-
 trunk/Documentation/watchdog/watchdog-api.txt          | 2 +-
 22 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index f3b4c5190788..62293d06bddc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fff9289b219f48cb2296714fea3d71f516991f9f
+refs/heads/master: a2ffd2751683f4275d4d1aa5ce37e5a6a1ae21df
diff --git a/trunk/Documentation/block/barrier.txt b/trunk/Documentation/block/barrier.txt
index 761073eae103..de3d88edb7f1 100644
--- a/trunk/Documentation/block/barrier.txt
+++ b/trunk/Documentation/block/barrier.txt
@@ -56,7 +56,7 @@ There are four cases,
 i. No write-back cache.  Keeping requests ordered is enough.
 
 ii. Write-back cache but no flush operation.  There's no way to
-gurantee physical-medium commit order.  This kind of devices can't to
+guarantee physical-medium commit order.  This kind of devices can't to
 I/O barriers.
 
 iii. Write-back cache and flush operation but no FUA (forced unit
diff --git a/trunk/Documentation/block/deadline-iosched.txt b/trunk/Documentation/block/deadline-iosched.txt
index c918b3a6022d..672c06bcae8b 100644
--- a/trunk/Documentation/block/deadline-iosched.txt
+++ b/trunk/Documentation/block/deadline-iosched.txt
@@ -23,7 +23,7 @@ you can do so by typing:
 read_expire	(in ms)
 -----------
 
-The goal of the deadline io scheduler is to attempt to guarentee a start
+The goal of the deadline io scheduler is to attempt to guarantee a start
 service time for a request. As we focus mainly on read latencies, this is
 tunable. When a read request first enters the io scheduler, it is assigned
 a deadline that is the current time + the read_expire value in units of
diff --git a/trunk/Documentation/cpu-freq/cpufreq-stats.txt b/trunk/Documentation/cpu-freq/cpufreq-stats.txt
index 6a82948ff4bd..48bc2f1fff78 100644
--- a/trunk/Documentation/cpu-freq/cpufreq-stats.txt
+++ b/trunk/Documentation/cpu-freq/cpufreq-stats.txt
@@ -53,7 +53,7 @@ drwxr-xr-x  3 root root    0 May 14 15:58 ..
 This gives the amount of time spent in each of the frequencies supported by
 this CPU. The cat output will have "<frequency> <time>" pair in each line, which
 will mean this CPU spent <time> usertime units of time at <frequency>. Output
-will have one line for each of the supported freuencies. usertime units here 
+will have one line for each of the supported frequencies. usertime units here 
 is 10mS (similar to other time exported in /proc).
 
 --------------------------------------------------------------------------------
diff --git a/trunk/Documentation/cpu-freq/governors.txt b/trunk/Documentation/cpu-freq/governors.txt
index f4b8dc4237e6..f40589c31a57 100644
--- a/trunk/Documentation/cpu-freq/governors.txt
+++ b/trunk/Documentation/cpu-freq/governors.txt
@@ -109,7 +109,7 @@ directory.
 2.4 Ondemand
 ------------
 
-The CPUfreq govenor "ondemand" sets the CPU depending on the
+The CPUfreq governor "ondemand" sets the CPU depending on the
 current usage. To do this the CPU must have the capability to
 switch the frequency very quickly.  There are a number of sysfs file
 accessible parameters:
diff --git a/trunk/Documentation/dell_rbu.txt b/trunk/Documentation/dell_rbu.txt
index 8c93d8813791..6ddf9fcb2846 100644
--- a/trunk/Documentation/dell_rbu.txt
+++ b/trunk/Documentation/dell_rbu.txt
@@ -55,8 +55,8 @@ echo XXXX > /sys/devices/platform/dell_rbu/packet_size
 In the packet update mechanism, the user neesd to create a new file having
 packets of data arranged back to back. It can be done as follows
 The user creates packets header, gets the chunk of the BIOS image and
-placs it next to the packetheader; now, the packetheader + BIOS image chunk
-added to geather should match the specified packet_size. This makes one
+places it next to the packetheader; now, the packetheader + BIOS image chunk
+added together should match the specified packet_size. This makes one
 packet, the user needs to create more such packets out of the entire BIOS
 image file and then arrange all these packets back to back in to one single
 file.
diff --git a/trunk/Documentation/dvb/faq.txt b/trunk/Documentation/dvb/faq.txt
index 0b2399e6b90d..25fae0b4ce07 100644
--- a/trunk/Documentation/dvb/faq.txt
+++ b/trunk/Documentation/dvb/faq.txt
@@ -153,7 +153,7 @@ Some very frequently asked questions about linuxtv-dvb
 	- video-buf: capture helper module for the saa7146_vv driver. This
 	  one is responsible to handle capture buffers.
 
-	- dvb-ttpci: The main driver for AV7110 based, full-featued
+	- dvb-ttpci: The main driver for AV7110 based, full-featured
 	  DVB-S/C/T cards
 
 eof
diff --git a/trunk/Documentation/fb/sisfb.txt b/trunk/Documentation/fb/sisfb.txt
index 3b50c517a08d..2e68e503e72f 100644
--- a/trunk/Documentation/fb/sisfb.txt
+++ b/trunk/Documentation/fb/sisfb.txt
@@ -72,7 +72,7 @@ information. Additionally, "modinfo sisfb" gives an overview over all
 supported options including some explanation.
 
 The desired display mode can be specified using the keyword "mode" with
-a parameter in one of the follwing formats:
+a parameter in one of the following formats:
   - XxYxDepth or
   - XxY-Depth or
   - XxY-Depth@Rate or
diff --git a/trunk/Documentation/fb/sstfb.txt b/trunk/Documentation/fb/sstfb.txt
index c7088c6d5df5..4b6c38089b8e 100644
--- a/trunk/Documentation/fb/sstfb.txt
+++ b/trunk/Documentation/fb/sstfb.txt
@@ -77,7 +77,7 @@ Kernel/Modules Options
 	for module : insmod sstfb.o option1=value1 option2=value2 ...
 	in kernel :  video=sstfb:option1,option2:value2,option3 ...
 	
-	sstfb supports the folowing options :
+	sstfb supports the following options :
 
 Module		Kernel		Description
 
diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt
index b98f01fc14bf..486638f24b4f 100644
--- a/trunk/Documentation/feature-removal-schedule.txt
+++ b/trunk/Documentation/feature-removal-schedule.txt
@@ -184,7 +184,7 @@ Who:	Greg Kroah-Hartman <gregkh@suse.de>
 ---------------------------
 
 What:	USB driver API moves to EXPORT_SYMBOL_GPL
-When:	Febuary 2008
+When:	February 2008
 Files:	include/linux/usb.h, drivers/usb/core/driver.c
 Why:	The USB subsystem has changed a lot over time, and it has been
 	possible to create userspace USB drivers using usbfs/libusb/gadgetfs
diff --git a/trunk/Documentation/filesystems/spufs.txt b/trunk/Documentation/filesystems/spufs.txt
index 8edc3952eff4..302df12b762f 100644
--- a/trunk/Documentation/filesystems/spufs.txt
+++ b/trunk/Documentation/filesystems/spufs.txt
@@ -84,7 +84,7 @@ FILES
    /ibox
        The  second  SPU  to CPU communication mailbox. This file is similar to
        the first mailbox file, but can be read in blocking I/O mode,  and  the
-       poll  familiy of system calls can be used to wait for it.  The possible
+       poll  family of system calls can be used to wait for it.  The  possible
        operations on an open ibox file are:
 
        read(2)
diff --git a/trunk/Documentation/lockdep-design.txt b/trunk/Documentation/lockdep-design.txt
index 55a7e4fa8cc2..7f2bb8e342fa 100644
--- a/trunk/Documentation/lockdep-design.txt
+++ b/trunk/Documentation/lockdep-design.txt
@@ -158,7 +158,7 @@ enum bdev_bd_mutex_lock_class
 In this case the locking is done on a bdev object that is known to be a
 partition.
 
-The validator treats a lock that is taken in such a nested fasion as a
+The validator treats a lock that is taken in such a nested fashion as a
 separate (sub)class for the purposes of validation.
 
 Note: When changing code to use the _nested() primitives, be careful and
diff --git a/trunk/Documentation/networking/cxgb.txt b/trunk/Documentation/networking/cxgb.txt
index 7b231752f25b..20a887615c4a 100644
--- a/trunk/Documentation/networking/cxgb.txt
+++ b/trunk/Documentation/networking/cxgb.txt
@@ -172,7 +172,7 @@ PERFORMANCE
    smaller window prevents congestion and facilitates better pacing,
    especially if/when MAC level flow control does not work well or when it is
    not supported on the machine. Experimentation may be necessary to attain
-   the correct value. This method is provided as a starting point fot the
+   the correct value. This method is provided as a starting point for the
    correct receive buffer size.
    Setting the min, max, and default receive buffer (RX_WINDOW) size is
    performed in the same manner as single connection.
diff --git a/trunk/Documentation/networking/fib_trie.txt b/trunk/Documentation/networking/fib_trie.txt
index f50d0c673c57..0723db7f8495 100644
--- a/trunk/Documentation/networking/fib_trie.txt
+++ b/trunk/Documentation/networking/fib_trie.txt
@@ -79,7 +79,7 @@ trie_rebalance()
 
 resize()
 	Analyzes a tnode and optimizes the child array size by either inflating
-	or shrinking it repeatedly until it fullfills the criteria for optimal
+	or shrinking it repeatedly until it fulfills the criteria for optimal
 	level compression. This part follows the original paper pretty closely
 	and there may be some room for experimentation here.
 
diff --git a/trunk/Documentation/powerpc/booting-without-of.txt b/trunk/Documentation/powerpc/booting-without-of.txt
index bfcd95dd3c36..042c0cfa94cb 100644
--- a/trunk/Documentation/powerpc/booting-without-of.txt
+++ b/trunk/Documentation/powerpc/booting-without-of.txt
@@ -573,7 +573,7 @@ implementation of Open Firmware or an implementation compatible with
 the Open Firmware client interface, those properties will be created
 by the trampoline code in the kernel's prom_init() file. For example,
 that's where you'll have to add code to detect your board model and
-set the platform number. However, when using the flatenned device-tree
+set the platform number. However, when using the flattened device-tree
 entry point, there is no prom_init() pass, and thus you have to
 provide those properties yourself.
 
@@ -689,7 +689,7 @@ is present).
 4) Note about node and property names and character set
 -------------------------------------------------------
 
-While open firmware provides more flexibe usage of 8859-1, this
+While open firmware provides more flexible usage of 8859-1, this
 specification enforces more strict rules. Nodes and properties should
 be comprised only of ASCII characters 'a' to 'z', '0' to
 '9', ',', '.', '_', '+', '#', '?', and '-'. Node names additionally
diff --git a/trunk/Documentation/powerpc/eeh-pci-error-recovery.txt b/trunk/Documentation/powerpc/eeh-pci-error-recovery.txt
index 3764dd4b12cb..be8867d03db8 100644
--- a/trunk/Documentation/powerpc/eeh-pci-error-recovery.txt
+++ b/trunk/Documentation/powerpc/eeh-pci-error-recovery.txt
@@ -116,7 +116,7 @@ At this time, a generic EEH recovery mechanism has been implemented,
 so that individual device drivers do not need to be modified to support
 EEH recovery.  This generic mechanism piggy-backs on the PCI hotplug
 infrastructure,  and percolates events up through the userspace/udev
-infrastructure.  Followiing is a detailed description of how this is
+infrastructure.  Following is a detailed description of how this is
 accomplished.
 
 EEH must be enabled in the PHB's very early during the boot process,
diff --git a/trunk/Documentation/powerpc/hvcs.txt b/trunk/Documentation/powerpc/hvcs.txt
index 1e38166f4e54..f93462c5db25 100644
--- a/trunk/Documentation/powerpc/hvcs.txt
+++ b/trunk/Documentation/powerpc/hvcs.txt
@@ -259,7 +259,7 @@ This index of '2' means that in order to connect to vty-server adapter
 
 It should be noted that due to the system hotplug I/O capabilities of a
 system the /dev/hvcs* entry that interacts with a particular vty-server
-adapter is not guarenteed to remain the same across system reboots.  Look
+adapter is not guaranteed to remain the same across system reboots.  Look
 in the Q & A section for more on this issue.
 
 ---------------------------------------------------------------------------
diff --git a/trunk/Documentation/s390/Debugging390.txt b/trunk/Documentation/s390/Debugging390.txt
index ffb74a1656e6..248953a2574b 100644
--- a/trunk/Documentation/s390/Debugging390.txt
+++ b/trunk/Documentation/s390/Debugging390.txt
@@ -88,7 +88,7 @@ s/390 z/Architecture
 0       0     Reserved ( must be 0 ) otherwise specification exception occurs.
 
 1       1     Program Event Recording 1 PER enabled, 
-	      PER is used to facilititate debugging e.g. single stepping.
+	      PER is used to facilitate debugging e.g. single stepping.
 
 2-4    2-4    Reserved ( must be 0 ). 
 
diff --git a/trunk/Documentation/s390/s390dbf.txt b/trunk/Documentation/s390/s390dbf.txt
index 5ff6fe551b93..2095a2704b8f 100644
--- a/trunk/Documentation/s390/s390dbf.txt
+++ b/trunk/Documentation/s390/s390dbf.txt
@@ -11,7 +11,7 @@ where log records can be stored efficiently in memory, where each component
 (e.g. device drivers) can have one separate debug log.
 One purpose of this is to inspect the debug logs after a production system crash
 in order to analyze the reason for the crash.
-If the system still runs but only a subcomponent which uses dbf failes,
+If the system still runs but only a subcomponent which uses dbf fails,
 it is possible to look at the debug logs on a live system via the Linux
 debugfs filesystem.
 The debug feature may also very useful for kernel and driver development.
diff --git a/trunk/Documentation/scsi/aic7xxx_old.txt b/trunk/Documentation/scsi/aic7xxx_old.txt
index 79e5ac6cb6ff..433e942a24ec 100644
--- a/trunk/Documentation/scsi/aic7xxx_old.txt
+++ b/trunk/Documentation/scsi/aic7xxx_old.txt
@@ -317,7 +317,7 @@ linux-1.1.x and fairly stable since linux-1.2.x, and are also in FreeBSD
 	initial DEVCONFIG values for each of your aic7xxx controllers as
 	they are listed, and also record what the machine is detecting as
 	the proper termination on your controllers.  NOTE: the order in
-	which the initial DEVCONFIG values are printed out is not gauranteed
+	which the initial DEVCONFIG values are printed out is not guaranteed
 	to be the same order as the SCSI controllers are registered.  The
 	above option and this option both work on the order of the SCSI
 	controllers as they are registered, so make sure you match the right
diff --git a/trunk/Documentation/uml/UserModeLinux-HOWTO.txt b/trunk/Documentation/uml/UserModeLinux-HOWTO.txt
index 60e482bdf8fa..ecee1002ead4 100644
--- a/trunk/Documentation/uml/UserModeLinux-HOWTO.txt
+++ b/trunk/Documentation/uml/UserModeLinux-HOWTO.txt
@@ -4621,7 +4621,7 @@
   Chris Reahard built a specialized root filesystem for running a DNS
   server jailed inside UML.  It's available from the download
   <http://user-mode-linux.sourceforge.net/dl-sf.html>  page in the Jail
-  Filesysems section.
+  Filesystems section.
 
 
 
diff --git a/trunk/Documentation/watchdog/watchdog-api.txt b/trunk/Documentation/watchdog/watchdog-api.txt
index 958ff3d48be3..12ad3b87b86d 100644
--- a/trunk/Documentation/watchdog/watchdog-api.txt
+++ b/trunk/Documentation/watchdog/watchdog-api.txt
@@ -207,7 +207,7 @@ Note that not all devices support these two calls, and some only
 support the GETBOOTSTATUS call.
 
 Some drivers can measure the temperature using the GETTEMP ioctl.  The
-returned value is the temperature in degrees farenheit.
+returned value is the temperature in degrees fahrenheit.
 
     int temperature;
     ioctl(fd, WDIOC_GETTEMP, &temperature);