diff --git a/[refs] b/[refs]
index a6f7da18d0f8..0dd47d11616e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3db6639fee577f6ed92c0a1fc881e748c47ec48
+refs/heads/master: d3ddcf471ea90d7ff711dbaa371ef379ed625ec0
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index cf70f123f574..fd597a4b5dad 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -846,7 +846,7 @@ sub possible {
 	if ($possible !~ /^(?:$Storage|$Type|DEFINE_\S+)$/ &&
 	    $possible ne 'goto' && $possible ne 'return' &&
 	    $possible ne 'case' && $possible ne 'else' &&
-	    $possible ne 'asm' &&
+	    $possible ne 'asm' && $possible ne '__asm__' &&
 	    $possible !~ /^(typedef|struct|enum)\b/) {
 		# Check for modifiers.
 		$possible =~ s/\s*$Storage\s*//g;