diff --git a/[refs] b/[refs]
index f279a5acd27e..60a5bf6cc91e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb9f1f17e9c117c0bf7a8f1b7a0efe5db5bc1836
+refs/heads/master: ffbbf2da9e578dc7b7ae4f945412c4b74f54b20e
diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h
index e2f4d6af2125..2fe6e84894a4 100644
--- a/trunk/include/linux/kernel.h
+++ b/trunk/include/linux/kernel.h
@@ -588,7 +588,7 @@ struct sysinfo {
 
 /**
  * BUILD_BUG_ON - break compile if a condition is true.
- * @cond: the condition which the compiler should know is false.
+ * @condition: the condition which the compiler should know is false.
  *
  * If you have some code which relies on certain constants being equal, or
  * other compile-time-evaluated condition, you should use BUILD_BUG_ON to