Merge branch 'master'; commit 'v2.6.39-rc3' into next

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/infiniband/hw/qib/qib_file_ops.c b/drivers/infiniband/hw/qib/qib_file_ops.c
index 75bfad16c114..406fca50d036 100644
--- a/drivers/infiniband/hw/qib/qib_file_ops.c
+++ b/drivers/infiniband/hw/qib/qib_file_ops.c
@@ -1539,7 +1539,7 @@ done_chk_sdma:
 
                 /*
                  * If process has NOT already set it's affinity, select and
-                 * reserve a processor for it, as a rendevous for all
+                 * reserve a processor for it, as a rendezvous for all
                  * users of the driver.  If they don't actually later
                  * set affinity to this cpu, or set it to some other cpu,
                  * it just means that sooner or later we don't recommend
@@ -1657,7 +1657,7 @@ static int qib_do_user_init(struct file *fp,
          * 0 to 1.  So for those chips, we turn it off and then back on.
          * This will (very briefly) affect any other open ctxts, but the
          * duration is very short, and therefore isn't an issue.  We
-         * explictly set the in-memory tail copy to 0 beforehand, so we
+         * explicitly set the in-memory tail copy to 0 beforehand, so we
          * don't have to wait to be sure the DMA update has happened
          * (chip resets head/tail to 0 on transition to enable).
          */