diff --git a/[refs] b/[refs]
index 193e90265459..17a8ad3718e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab63a633cf072c719f885e46fa4814624312f672
+refs/heads/master: 17aacfb9cdf9a8329a6ece9c437551a29c93e47b
diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c
index 55fe0c7cd95f..ed38bbfc48a3 100644
--- a/trunk/kernel/lockdep.c
+++ b/trunk/kernel/lockdep.c
@@ -2424,7 +2424,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
 		return 0;
 
 	/*
-	 * Calculate the chain hash: it's the combined has of all the
+	 * Calculate the chain hash: it's the combined hash of all the
 	 * lock keys along the dependency chain. We save the hash value
 	 * at every step so that we can get the current hash easily
 	 * after unlock. The chain hash is then used to cache dependency