Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release

[linux-2.6] / drivers / message / i2o / README.ioctl

diff --git a/drivers/message/i2o/README.ioctl b/drivers/message/i2o/README.ioctl
index 73dd084c0e98cd7b21431b5bd812bd891cedbd39..65c0c47aeb7905677256af6cafec6277a7ce79fd 100644 (file)
--- a/drivers/message/i2o/README.ioctl
+++ b/drivers/message/i2o/README.ioctl
@@ -185,7 +185,7 @@ VII. Getting Parameters
       ENOMEM      Kernel memory allocation error
 
    A return value of 0 does not mean that the value was actually
       ENOMEM      Kernel memory allocation error
 
    A return value of 0 does not mean that the value was actually

-   properly retreived.  The user should check the result list 
+   properly retrieved.  The user should check the result list 

    to determine the specific status of the transaction.
 
 VIII. Downloading Software
    to determine the specific status of the transaction.
 
 VIII. Downloading Software