diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/scsi/megaraid/megaraid_mbox.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/scsi/megaraid/megaraid_mbox.c')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_mbox.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) | |||
| 2704 | } | 2704 | } |
| 2705 | else { | 2705 | else { |
| 2706 | con_log(CL_ANN, (KERN_NOTICE | 2706 | con_log(CL_ANN, (KERN_NOTICE |
| 2707 | "megaraid mbox: reset sequence completed sucessfully\n")); | 2707 | "megaraid mbox: reset sequence completed successfully\n")); |
| 2708 | } | 2708 | } |
| 2709 | 2709 | ||
| 2710 | 2710 | ||