Merge commit 'v2.6.39-rc3' into for-2.6.39

[pandora-kernel.git] / drivers / infiniband / hw / amso1100 / c2_ae.c

diff --git a/drivers/infiniband/hw/amso1100/c2_ae.c b/drivers/infiniband/hw/amso1100/c2_ae.c
index 62af742..24f9e3a 100644 (file)
--- a/drivers/infiniband/hw/amso1100/c2_ae.c
+++ b/drivers/infiniband/hw/amso1100/c2_ae.c
@@ -157,7 +157,7 @@ void c2_ae_event(struct c2_dev *c2dev, u32 mq_index)
        int status;
 
        /*
-        * retreive the message
+        * retrieve the message
         */
        wr = c2_mq_consume(mq);
        if (!wr)