diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2012-07-17 14:04:20 +0400 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2012-07-17 14:04:20 +0400 |
| commit | 8ce44a2174c3b07950d7a8d44774e23e60518205 (patch) | |
| tree | 4bf04cdeed59775462d5326d3bcb00c7343b6163 /scripts | |
| parent | f9a4f063a88297e361fd6676986cf3e39b22de72 (diff) | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
| download | linux-8ce44a2174c3b07950d7a8d44774e23e60518205.tar.xz | |
Merge tag 'v3.5-rc7' into arm/tegra
This solves the merge conflicts while creating the next
branch.
Linux 3.5-rc7
Conflicts:
drivers/iommu/tegra-smmu.c
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/get_maintainer.pl | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | scripts/gfp-translate | 0 |
2 files changed, 2 insertions, 1 deletions
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl index 0948c6b5a321..8b673dd4627f 100755 --- a/scripts/get_maintainer.pl +++ b/scripts/get_maintainer.pl @@ -83,6 +83,8 @@ push(@signature_tags, "Signed-off-by:"); push(@signature_tags, "Reviewed-by:"); push(@signature_tags, "Acked-by:"); +my $signature_pattern = "\(" . join("|", @signature_tags) . "\)"; + # rfc822 email address - preloaded methods go here. my $rfc822_lwsp = "(?:(?:\\r\\n)?[ \\t])"; my $rfc822_char = '[\\000-\\377]'; @@ -473,7 +475,6 @@ my @subsystem = (); my @status = (); my %deduplicate_name_hash = (); my %deduplicate_address_hash = (); -my $signature_pattern; my @maintainers = get_maintainers(); diff --git a/scripts/gfp-translate b/scripts/gfp-translate index c9230e158a8f..c9230e158a8f 100644..100755 --- a/scripts/gfp-translate +++ b/scripts/gfp-translate |