|author||Jiri Kosina <firstname.lastname@example.org>||2011-04-26 10:22:15 +0200|
|committer||Jiri Kosina <email@example.com>||2011-04-26 10:22:59 +0200|
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be applied for files that didn't exist on the old branch.
Diffstat (limited to 'Documentation/CodingStyle')
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/CodingStyle b/Documentation/CodingStyle
index 1cd3478e583..58b0bf91783 100644
@@ -168,6 +168,13 @@ Do not unnecessarily use braces where a single statement will do.
This does not apply if one branch of a conditional statement is a single
statement. Use braces in both branches.