From 40d16286e85b92af5bf24e5940cb6b552c8685f2 Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@canonical.com>
Date: Mon, 26 Oct 2009 16:50:14 -0700
Subject: [PATCH] --- yaml --- r: 167764 b: refs/heads/master c:
 2ceb532b04b7a3b8f534d11a6e839f8b8bff94c1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 56349ba0e608..146f6b4214fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 131edb3418018b6da297ed389b541e697043a8b6
+refs/heads/master: 2ceb532b04b7a3b8f534d11a6e839f8b8bff94c1
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 05b10d6bc581..cb2dac37aaff 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -130,7 +130,10 @@ sub help {
 
 my $emitted_corrupt = 0;
 
-our $Ident       = qr{[A-Za-z_][A-Za-z\d_]*};
+our $Ident	= qr{
+			[A-Za-z_][A-Za-z\d_]*
+			(?:\s*\#\#\s*[A-Za-z_][A-Za-z\d_]*)*
+		}x;
 our $Storage	= qr{extern|static|asmlinkage};
 our $Sparse	= qr{
 			__user|