Merge with Linux 2.4.0-test6-pre1.

2 files changed, 2 insertions, 2 deletions

diff --git a/Documentation/cdrom/cdrom-standard.tex b/Documentation/cdrom/cdrom-standard.tex
index 1bf6434cb..61becaf07 100644
--- a/Documentation/cdrom/cdrom-standard.tex
+++ b/Documentation/cdrom/cdrom-standard.tex
@@ -919,7 +919,7 @@ the current flags.
   than fixing this interface by changing the assumptions it was made
   under, thereby breaking all user applications that use this
   function, the \UCD\ implements this $ioctl$ as follows: If the CD in
-  question has audio tracks on it, and it has absolutly no CD-I, XA,
+  question has audio tracks on it, and it has absolutely no CD-I, XA,
   or data tracks on it, it will be reported as $CDS_AUDIO$.  If it has
   both audio and data tracks, it will return $CDS_MIXED$.  If there
   are no audio tracks on the disc, and if the CD in question has any
diff --git a/Documentation/cdrom/ide-cd b/Documentation/cdrom/ide-cd
index b5967f506..8146e9987 100644
--- a/Documentation/cdrom/ide-cd
+++ b/Documentation/cdrom/ide-cd
@@ -286,7 +286,7 @@ b. Timeout/IRQ errors.
     Unfortunately, these drives seem to become very confused when we perform
     the standard Linux ATA disk drive probe. If you own one of these drives,
     you can bypass the ATA probing which confuses these CDROM drives, by 
-    adding `append="hdX=noprobe hdX=cdrom"' to your lilo.conf file and runing 
+    adding `append="hdX=noprobe hdX=cdrom"' to your lilo.conf file and running 
     lilo (again where X is the drive letter corresponding to where your drive 
     is installed.)