diff --git a/[refs] b/[refs]
index 1d092bf94ff7..0c755ba6b08b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5492666a3b62344de9026a960c11888160362c9
+refs/heads/master: 1d606b4e0bf8fe45e3f88543dfce83207ae0027d
diff --git a/trunk/scripts/get_maintainer.pl b/trunk/scripts/get_maintainer.pl
index 35781e0d43e6..fb446e0f8bbf 100755
--- a/trunk/scripts/get_maintainer.pl
+++ b/trunk/scripts/get_maintainer.pl
@@ -211,6 +211,7 @@
 	    if ($type eq 'X') {
 		if (file_match_pattern($file, $value)) {
 		    $exclude = 1;
+		    last;
 		}
 	    }
 	}
@@ -218,18 +219,24 @@
 
     if (!$exclude) {
 	my $tvi = 0;
+	my %hash;
 	foreach my $line (@typevalue) {
 	    if ($line =~ m/^(\C):\s*(.*)/) {
 		my $type = $1;
 		my $value = $2;
 		if ($type eq 'F') {
 		    if (file_match_pattern($file, $value)) {
-			add_categories($tvi);
+			my $pattern_depth = ($value =~ tr@/@@);
+			$pattern_depth++ if (!(substr($value,-1,1) eq "/"));
+			$hash{$tvi} = $pattern_depth;
 		    }
 		}
 	    }
 	    $tvi++;
 	}
+	foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) {
+	    add_categories($line);
+	}
     }
 
     if ($email && $email_git) {