Merge commit 'v2.6.39-rc3' into for-2.6.39

8 files changed, 16 insertions, 16 deletions

diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c
index ec166726b314..c454e44cf51c 100644
--- a/drivers/scsi/arm/acornscsi.c
+++ b/drivers/scsi/arm/acornscsi.c
@@ -100,7 +100,7 @@
  */
 #define TIMEOUT_TIME 10
 /*
- * Define this if you want to have verbose explaination of SCSI
+ * Define this if you want to have verbose explanation of SCSI
  * status/messages.
  */
 #undef CONFIG_ACORNSCSI_CONSTANTS
@@ -1561,7 +1561,7 @@ void acornscsi_message(AS_Host *host)
         /*
          * If we were negociating sync transfer, we don't yet know if
          * this REJECT is for the sync transfer or for the tagged queue/wide
-         * transfer.  Re-initiate sync transfer negociation now, and if
+         * transfer.  Re-initiate sync transfer negotiation now, and if
          * we got a REJECT in response to SDTR, then it'll be set to DONE.
          */
         if (host->device[host->SCpnt->device->id].sync_state == SYNC_SENT_REQUEST)
diff --git a/drivers/scsi/arm/acornscsi.h b/drivers/scsi/arm/acornscsi.h
index 8d2172a0b351..01bc715a3aec 100644
--- a/drivers/scsi/arm/acornscsi.h
+++ b/drivers/scsi/arm/acornscsi.h
@@ -223,8 +223,8 @@ typedef enum {
  * Synchronous transfer state
  */
 typedef enum {                                  /* Synchronous transfer state           */
-    SYNC_ASYNCHRONOUS,                          /* don't negociate synchronous transfers*/
-    SYNC_NEGOCIATE,                             /* start negociation                    */
+    SYNC_ASYNCHRONOUS,                          /* don't negotiate synchronous transfers*/
+    SYNC_NEGOCIATE,                             /* start negotiation                    */
     SYNC_SENT_REQUEST,                          /* sent SDTR message                    */
     SYNC_COMPLETED,                             /* received SDTR reply                  */
 } syncxfer_t;
@@ -322,7 +322,7 @@ typedef struct acornscsi_hostdata {
     /* per-device info */
     struct {
         unsigned char   sync_xfer;              /* synchronous transfer (SBIC value)    */
-        syncxfer_t      sync_state;             /* sync xfer negociation state          */
+        syncxfer_t      sync_state;             /* sync xfer negotiation state          */
         unsigned char   disconnect_ok:1;        /* device can disconnect                */
     } device[8];
     unsigned long       busyluns[64 / sizeof(unsigned long)];/* array of bits indicating LUNs busy      */
diff --git a/drivers/scsi/arm/arxescsi.c b/drivers/scsi/arm/arxescsi.c
index 2836fe248df9..a750aa72b8ef 100644
--- a/drivers/scsi/arm/arxescsi.c
+++ b/drivers/scsi/arm/arxescsi.c
@@ -228,7 +228,7 @@ static const char *arxescsi_info(struct Scsi_Host *host)
  * Params  : buffer - a buffer to write information to
  *           start  - a pointer into this buffer set by this routine to the start
  *                    of the required information.
- *           offset - offset into information that we have read upto.
+ *           offset - offset into information that we have read up to.
  *           length - length of buffer
  *           host_no - host number to return information for
  *           inout  - 0 for reading, 1 for writing.
diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c
index c9902b5c1f2b..547987b86384 100644
--- a/drivers/scsi/arm/cumana_2.c
+++ b/drivers/scsi/arm/cumana_2.c
@@ -344,7 +344,7 @@ cumanascsi_2_set_proc_info(struct Scsi_Host *host, char *buffer, int length)
  * Params   : buffer - a buffer to write information to
  *            start  - a pointer into this buffer set by this routine to the start
  *                     of the required information.
- *            offset - offset into information that we have read upto.
+ *            offset - offset into information that we have read up to.
  *            length - length of buffer
  *            host_no - host number to return information for
  *            inout  - 0 for reading, 1 for writing.
diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c
index d8435132f461..edfd12b48c28 100644
--- a/drivers/scsi/arm/eesox.c
+++ b/drivers/scsi/arm/eesox.c
@@ -429,7 +429,7 @@ eesoxscsi_set_proc_info(struct Scsi_Host *host, char *buffer, int length)
  * Params   : buffer - a buffer to write information to
  *            start  - a pointer into this buffer set by this routine to the start
  *                     of the required information.
- *            offset - offset into information that we have read upto.
+ *            offset - offset into information that we have read up to.
  *            length - length of buffer
  *            host_no - host number to return information for
  *            inout  - 0 for reading, 1 for writing.
diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index 2b2ce21e227e..e85c40b6e19b 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -2119,7 +2119,7 @@ request_sense:
          * executed, unless a target connects to us.
          */
         if (info->reqSCpnt)
-                printk(KERN_WARNING "scsi%d.%c: loosing request command\n",
+                printk(KERN_WARNING "scsi%d.%c: losing request command\n",
                         info->host->host_no, '0' + SCpnt->device->id);
         info->reqSCpnt = SCpnt;
 }
@@ -2294,7 +2294,7 @@ static int fas216_noqueue_command_lck(struct scsi_cmnd *SCpnt,
                  * If we don't have an IRQ, then we must poll the card for
                  * it's interrupt, and use that to call this driver's
                  * interrupt routine.  That way, we keep the command
-                 * progressing.  Maybe we can add some inteligence here
+                 * progressing.  Maybe we can add some intelligence here
                  * and go to sleep if we know that the device is going
                  * to be some time (eg, disconnected).
                  */
diff --git a/drivers/scsi/arm/fas216.h b/drivers/scsi/arm/fas216.h
index f30f8d659dc4..84b7127c0121 100644
--- a/drivers/scsi/arm/fas216.h
+++ b/drivers/scsi/arm/fas216.h
@@ -203,11 +203,11 @@ typedef enum {
 } fasdmatype_t;
 
 typedef enum {
-        neg_wait,                                       /* Negociate with device                */
-        neg_inprogress,                                 /* Negociation sent                     */
-        neg_complete,                                   /* Negociation complete                 */
-        neg_targcomplete,                               /* Target completed negociation         */
-        neg_invalid                                     /* Negociation not supported            */
+        neg_wait,                                       /* Negotiate with device                */
+        neg_inprogress,                                 /* Negotiation sent                     */
+        neg_complete,                                   /* Negotiation complete                 */
+        neg_targcomplete,                               /* Target completed negotiation         */
+        neg_invalid                                     /* Negotiation not supported            */
 } neg_t;
 
 #define MAGIC   0x441296bdUL
diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c
index e2297b4c1b9e..9274c0677b9c 100644
--- a/drivers/scsi/arm/powertec.c
+++ b/drivers/scsi/arm/powertec.c
@@ -232,7 +232,7 @@ powertecscsi_set_proc_info(struct Scsi_Host *host, char *buffer, int length)
  * Params   : buffer  - a buffer to write information to
  *            start   - a pointer into this buffer set by this routine to the start
  *                      of the required information.
- *            offset  - offset into information that we have read upto.
+ *            offset  - offset into information that we have read up to.
  *            length  - length of buffer
  *            inout   - 0 for reading, 1 for writing.
  * Returns  : length of data written to buffer.