Merge branch 'master'; commit 'v2.6.39-rc3' into next

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index 878bda0cce70..6e6e16aab9da 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -985,7 +985,7 @@ retry_wait:
         ReplyMsg = (pFWDownloadReply_t)iocp->ioctl_cmds.reply;
         iocstat = le16_to_cpu(ReplyMsg->IOCStatus) & MPI_IOCSTATUS_MASK;
         if (iocstat == MPI_IOCSTATUS_SUCCESS) {
-                printk(MYIOC_s_INFO_FMT "F/W update successfull!\n", iocp->name);
+                printk(MYIOC_s_INFO_FMT "F/W update successful!\n", iocp->name);
                 return 0;
         } else if (iocstat == MPI_IOCSTATUS_INVALID_FUNCTION) {
                 printk(MYIOC_s_WARN_FMT "Hmmm...  F/W download not supported!?!\n",
@@ -2407,7 +2407,7 @@ done_free_mem:
         }
 
         /* mf is null if command issued successfully
-         * otherwise, failure occured after mf acquired.
+         * otherwise, failure occurred after mf acquired.
          */
         if (mf)
                 mpt_free_msg_frame(ioc, mf);