Merge remote branch 'kumar/merge' into merge

[pandora-kernel.git] / drivers / net / cxgb4 / t4_hw.c

diff --git a/drivers/net/cxgb4/t4_hw.c b/drivers/net/cxgb4/t4_hw.c
index b9fd8a6..d1ec111 100644 (file)
--- a/drivers/net/cxgb4/t4_hw.c
+++ b/drivers/net/cxgb4/t4_hw.c
@@ -883,7 +883,7 @@ struct intr_info {
  *
  *     A table driven interrupt handler that applies a set of masks to an
  *     interrupt status word and performs the corresponding actions if the
- *     interrupts described by the mask have occured.  The actions include
+ *     interrupts described by the mask have occurred.  The actions include
  *     optionally emitting a warning or alert message.  The table is terminated
  *     by an entry specifying mask 0.  Returns the number of fatal interrupt
  *     conditions.