Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/smsc911x.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
index 9627d062e16..dd741bcd6cc 100644
--- a/drivers/scsi/initio.c
+++ b/drivers/scsi/initio.c
@@ -242,7 +242,7 @@ static u8 i91udftNvRam[64] =
 
 static u8 initio_rate_tbl[8] =  /* fast 20      */
 {
-                                /* nanosecond devide by 4 */
+                                /* nanosecond divide by 4 */
         12,                     /* 50ns,  20M   */
         18,                     /* 75ns,  13.3M */
         25,                     /* 100ns, 10M   */
@@ -1917,7 +1917,7 @@ static int int_initio_scsi_rst(struct initio_host * host)
 }
 
 /**
- *      int_initio_scsi_resel   -       Reselection occured
+ *      int_initio_scsi_resel   -       Reselection occurred
  *      @host: InitIO host adapter
  *
  *      A SCSI reselection event has been signalled and the interrupt