From a0477103f054b391e95218514361ca65e1ad5fa3 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Mon, 31 Jan 2011 09:29:14 -0800
Subject: [PATCH] --- yaml --- r: 232671 b: refs/heads/master c:
 ffbbf2da9e578dc7b7ae4f945412c4b74f54b20e h: refs/heads/master i:   232669:
 51a66198e730a594eb880c8d818fb31bfc7ed440   232667:
 285ba512baeb9cb102733659826695e76d91d95a   232663:
 ea2caed88755f36c1e1b80ff01b3577e9838a877   232655:
 d51c4f2e62a86f68a0f3f2f0b41fbc4832851d93   232639:
 48c56eb32927253c62d9521a5b32f3d6df4805d8 v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/kernel.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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