aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/CodingStyle
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-11-16 12:39:48 +1100
committerJames Morris <jmorris@namei.org>2011-11-16 12:39:48 +1100
commit24942c8e5cc8696064ee207ff29d4cf21f70dafc (patch)
tree08a8221eb72ec3da7746d7d76f6f5915ce77cde7 /Documentation/CodingStyle
parente163bc8e4a0cd1cdffadb58253f7651201722d56 (diff)
parentff0ff78068dd8a962358dbbdafa9d6f24540d3e5 (diff)
downloadkernel_goldelico_gta04-24942c8e5cc8696064ee207ff29d4cf21f70dafc.zip
kernel_goldelico_gta04-24942c8e5cc8696064ee207ff29d4cf21f70dafc.tar.gz
kernel_goldelico_gta04-24942c8e5cc8696064ee207ff29d4cf21f70dafc.tar.bz2
Merge branch 'master'; commit 'v3.2-rc2' into next
Diffstat (limited to 'Documentation/CodingStyle')
-rw-r--r--Documentation/CodingStyle4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/CodingStyle b/Documentation/CodingStyle
index c940239..2b90d32 100644
--- a/Documentation/CodingStyle
+++ b/Documentation/CodingStyle
@@ -166,8 +166,8 @@ if (condition)
else
do_that();
-This does not apply if one branch of a conditional statement is a single
-statement. Use braces in both branches.
+This does not apply if only one branch of a conditional statement is a single
+statement; in the latter case use braces in both branches:
if (condition) {
do_this();