Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/scsi/megaraid/mbox_defs.h b/drivers/scsi/megaraid/mbox_defs.h
index b25b74764ec3..ce2487a888ed 100644
--- a/drivers/scsi/megaraid/mbox_defs.h
+++ b/drivers/scsi/megaraid/mbox_defs.h
@@ -497,7 +497,7 @@ typedef struct {
  * @inserted_drive              : channel:Id of inserted drive
  * @battery_status              : bit 0: battery module missing
  *                              bit 1: VBAD
- *                              bit 2: temprature high
+ *                              bit 2: temperature high
  *                              bit 3: battery pack missing
  *                              bit 4,5:
  *                                      00 - charge complete
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index 234f0b7eb21c..f9ae8037a710 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -2704,7 +2704,7 @@ megaraid_reset_handler(struct scsi_cmnd *scp)
         }
         else {
                 con_log(CL_ANN, (KERN_NOTICE
-                "megaraid mbox: reset sequence completed sucessfully\n"));
+                "megaraid mbox: reset sequence completed successfully\n"));
         }