diff --git a/[refs] b/[refs]
index c8fffadb0d33..0121ca44970b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f53a9b80f011080555c498d2ca2dc6b1a77c42c
+refs/heads/master: 42bdf74c95b6935f3c09a09ba4bead6cad11b540
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 309050f30874..3e4099a6df51 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -2182,8 +2182,10 @@ sub process {
 				# Find out how long the conditional actually is.
 				my @newlines = ($c =~ /\n/gs);
 				my $cond_lines = 1 + $#newlines;
+				my $stat_real = '';
 
-				my $stat_real = raw_line($linenr, $cond_lines);
+				$stat_real = raw_line($linenr, $cond_lines)
+							. "\n" if ($cond_lines);
 				if (defined($stat_real) && $cond_lines > 1) {
 					$stat_real = "[...]\n$stat_real";
 				}