diff --git a/[refs] b/[refs]
index 71cbcdf67cdb..17f44a76dae3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28be5abb400e5e082f5225105fdc69337ec0c0b4
+refs/heads/master: e659ba4a0d2d471c0d73590f78e1a1b5a1eede48
diff --git a/trunk/Documentation/CodingStyle b/trunk/Documentation/CodingStyle
index 9069189e78ef..e7f5fc6ef20b 100644
--- a/trunk/Documentation/CodingStyle
+++ b/trunk/Documentation/CodingStyle
@@ -160,6 +160,21 @@ supply of new-lines on your screen is not a renewable resource (think
 25-line terminal screens here), you have more empty lines to put
 comments on.
 
+Do not unnecessarily use braces where a single statement will do.
+
+if (condition)
+	action();
+
+This does not apply if one branch of a conditional statement is a single
+statement. Use braces in both branches.
+
+if (condition) {
+	do_this();
+	do_that();
+} else {
+	otherwise();
+}
+
 		3.1:  Spaces
 
 Linux kernel style for use of spaces depends (mostly) on