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

[pandora-kernel.git] / drivers / misc / sgi-gru / grukservices.c

diff --git a/drivers/misc/sgi-gru/grukservices.c b/drivers/misc/sgi-gru/grukservices.c
index 34749ee..9e9bdda 100644 (file)
--- a/drivers/misc/sgi-gru/grukservices.c
+++ b/drivers/misc/sgi-gru/grukservices.c
@@ -229,7 +229,7 @@ again:
        bid = blade_id < 0 ? uv_numa_blade_id() : blade_id;
        bs = gru_base[bid];
 
-       /* Handle the case where migration occured while waiting for the sema */
+       /* Handle the case where migration occurred while waiting for the sema */
        down_read(&bs->bs_kgts_sema);
        if (blade_id < 0 && bid != uv_numa_blade_id()) {
                up_read(&bs->bs_kgts_sema);