Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

3 files changed, 4 insertions, 4 deletions

diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_pport.h b/drivers/scsi/bfa/include/defs/bfa_defs_pport.h
index a000bc4e2d4a..bf320412ee24 100644
--- a/drivers/scsi/bfa/include/defs/bfa_defs_pport.h
+++ b/drivers/scsi/bfa/include/defs/bfa_defs_pport.h
@@ -61,7 +61,7 @@ enum bfa_pport_speed {
  *              Port operational type (in sync with SNIA port type).
  */
 enum bfa_pport_type {
-        BFA_PPORT_TYPE_UNKNOWN = 1,     /*  port type is unkown */
+        BFA_PPORT_TYPE_UNKNOWN = 1,     /*  port type is unknown */
         BFA_PPORT_TYPE_TRUNKED = 2,     /*  Trunked mode */
         BFA_PPORT_TYPE_NPORT   = 5,     /*  P2P with switched fabric */
         BFA_PPORT_TYPE_NLPORT  = 6,     /*  public loop */
diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_tsensor.h b/drivers/scsi/bfa/include/defs/bfa_defs_tsensor.h
index 31881d218515..ade763dbc8ce 100644
--- a/drivers/scsi/bfa/include/defs/bfa_defs_tsensor.h
+++ b/drivers/scsi/bfa/include/defs/bfa_defs_tsensor.h
@@ -25,7 +25,7 @@
  * Temperature sensor status values
  */
 enum bfa_tsensor_status {
-        BFA_TSENSOR_STATUS_UNKNOWN   = 1,   /*  unkown status */
+        BFA_TSENSOR_STATUS_UNKNOWN   = 1,   /*  unknown status */
         BFA_TSENSOR_STATUS_FAULTY    = 2,   /*  sensor is faulty */
         BFA_TSENSOR_STATUS_BELOW_MIN = 3,   /*  temperature below mininum */
         BFA_TSENSOR_STATUS_NOMINAL   = 4,   /*  normal temperature */
diff --git a/drivers/scsi/bfa/include/protocol/ct.h b/drivers/scsi/bfa/include/protocol/ct.h
index c59d6630b070..79d16a9ab281 100644
--- a/drivers/scsi/bfa/include/protocol/ct.h
+++ b/drivers/scsi/bfa/include/protocol/ct.h
@@ -82,7 +82,7 @@ enum {
 };
 
 /*
- * defintions for CT reason code
+ * definitions for CT reason code
  */
 enum {
         CT_RSN_INV_CMD          = 0x01,
@@ -129,7 +129,7 @@ enum {
 };
 
 /*
- * defintions for the explanation code for all servers
+ * definitions for the explanation code for all servers
  */
 enum {
         CT_EXP_AUTH_EXCEPTION                   = 0xF1,