From 832ed3903885dad10b1951b27aad735ebef9f8e8 Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@canonical.com>
Date: Tue, 10 Jan 2012 15:10:00 -0800
Subject: [PATCH] --- yaml --- r: 283072 b: refs/heads/master c:
 89a883530fe79939384a6c6ed893c719762c7c9c h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/scripts/checkpatch.pl | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c465a822e679..d043061284ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7c76ba7e58bc3ca674f20759c686535db484749
+refs/heads/master: 89a883530fe79939384a6c6ed893c719762c7c9c
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 4c53d6f67339..b4390cf818da 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -1224,7 +1224,9 @@ sub possible {
 			case|
 			else|
 			asm|__asm__|
-			do
+			do|
+			\#|
+			\#\#|
 		)(?:\s|$)|
 		^(?:typedef|struct|enum)\b
 	    )}x;