diff --git a/[refs] b/[refs]
index 0dd47d11616e..72a53d48bc8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3ddcf471ea90d7ff711dbaa371ef379ed625ec0
+refs/heads/master: beae6332493a40116dba24928154621f2e88b9a9
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index fd597a4b5dad..94250d1a3a47 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -631,7 +631,7 @@ sub ctx_locate_comment {
 	my ($first_line, $end_line) = @_;
 
 	# Catch a comment on the end of the line itself.
-	my ($current_comment) = ($rawlines[$end_line - 1] =~ m@.*(/\*.*\*/)\s*$@);
+	my ($current_comment) = ($rawlines[$end_line - 1] =~ m@.*(/\*.*\*/)\s*(?:\\\s*)?$@);
 	return $current_comment if (defined $current_comment);
 
 	# Look through the context and try and figure out if there is a