diff --git a/[refs] b/[refs]
index 89cae2664153..596d11b0473d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 614e24be139c0ae70378349e6c6f0e21751e56bf
+refs/heads/master: a551acc2cb1f13a9bd728b8cf86f9adafefdcfb2
diff --git a/trunk/drivers/i2c/i2c-core.c b/trunk/drivers/i2c/i2c-core.c
index f50342832d95..51ce268998cd 100644
--- a/trunk/drivers/i2c/i2c-core.c
+++ b/trunk/drivers/i2c/i2c-core.c
@@ -238,7 +238,7 @@ int i2c_del_adapter(struct i2c_adapter *adap)
 	}
 
 	/* detach any active clients. This must be done first, because
-	 * it can fail; in which case we give upp. */
+	 * it can fail; in which case we give up. */
 	list_for_each_safe(item, _n, &adap->clients) {
 		client = list_entry(item, struct i2c_client, list);