Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6

* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
  Fix common misspellings

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/media/video/ov6650.c b/drivers/media/video/ov6650.c
index fe8e3ebd9ce4..456d9ad9ae5a 100644
--- a/drivers/media/video/ov6650.c
+++ b/drivers/media/video/ov6650.c
@@ -1038,7 +1038,7 @@ static int ov6650_reset(struct i2c_client *client)
         ret = ov6650_reg_rmw(client, REG_COMA, COMA_RESET, 0);
         if (ret)
                 dev_err(&client->dev,
-                        "An error occured while entering soft reset!\n");
+                        "An error occurred while entering soft reset!\n");
 
         return ret;
 }