diff --git a/[refs] b/[refs]
index a1e717a6ccf2..85206f32567a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cd7f3869c925622bbf420e1107a026d91dbd7f2
+refs/heads/master: 481eb486a88c9b068f0168ac4c21291802720933
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 6fa167758f82..3e9fee60642c 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -3009,10 +3009,12 @@ sub process {
 				}
 			}
 
-# check for line continuations outside of #defines
+# check for line continuations outside of #defines, preprocessor #, and asm
 
 		} else {
 			if ($prevline !~ /^..*\\$/ &&
+			    $line !~ /^\+\s*\#.*\\$/ &&		# preprocessor
+			    $line !~ /^\+.*\b(__asm__|asm)\b.*\\$/ &&	# asm
 			    $line =~ /^\+.*\\$/) {
 				WARN("LINE_CONTINUATIONS",
 				     "Avoid unnecessary line continuations\n" . $herecurr);