From af71cf8ee672431a74864852d78fdca3e6e7a8c5 Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@shadowen.org>
Date: Wed, 15 Oct 2008 22:02:18 -0700
Subject: [PATCH] --- yaml --- r: 114755 b: refs/heads/master c:
 636d140a80912693be466e8d978e658189972989 h: refs/heads/master i:   114753:
 b975afe1080ed577a53db012699ffdbc6910bf12   114751:
 02a2391690670d09d4a156ed908fd246f1fce6e2 v: v3

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

diff --git a/[refs] b/[refs]
index 53f630d3caf3..eb9e5b8863dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24e1d81acd447c3a7ec9eb90f24c00edc5a4b09f
+refs/heads/master: 636d140a80912693be466e8d978e658189972989
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 303c3634198b..586f9a4f0ad0 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -1977,8 +1977,8 @@ sub process {
 			# Extract the remainder of the define (if any) and
 			# rip off surrounding spaces, and trailing \'s.
 			$rest = '';
-			while ($off != 0 || ($cnt > 0 && $rest =~ /(?:^|\\)\s*$/)) {
-				#print "ADDING $off <" . substr($lines[$ln - 1], $off) . ">\n";
+			while ($off != 0 || ($cnt > 0 && $rest =~ /\\\s*$/)) {
+				#print "ADDING cnt<$cnt> $off <" . substr($lines[$ln - 1], $off) . "> rest<$rest>\n";
 				if ($off != 0 || $lines[$ln - 1] !~ /^-/) {
 					$rest .= substr($lines[$ln - 1], $off) . "\n";
 					$cnt--;