Skip to contentSkip to conversation

MAINTAINERS cleanups and get_maintainer.pl enhancements

PATCH New Joe Perches 4 participants 22 messages Jul 13, 2009 – Jul 14, 2009 GET_MAINTAINER script

lore
Share & tools
lore

Joe Perches

author maintainer
#0 lore raw

cover MAINTAINERS cleanups and get_maintainer.pl enhancements

A collection of cleanup patches to MAINTAINERS

scripts/get_maintainer.pl is improved a couple of ways.
-f option allows git to return maintainers for directories --git-min-percent option allows cleanup style committers aren't maintainers

Joe Perches (16):
MAINTAINERS: IA64 - pair P:/M: entries properly
MAINTAINERS: Remove ivtv-user lists, add CX18 url
MAINTAINERS: QLGE 10Gb ETHERNET - pair P:/M: entries properly
MAINTAINERS: Use tabs in ACER ASPIRE ONE
MAINTAINERS: Remove L: [email protected]
MAINTAINERS: Move ARPD to CREDITS
MAINTAINERS: Update KERNEL JANITORS
MAINTAINERS: Add PPS patterns
MAINTAINERS: USB Serial Digi Acceleport: use separate P: for Al Borchers
MAINTAINERS: INPUT: Add Dmitry's name to his email address
MAINTAINERS: Remove CS461x sound card section
MAINTAINERS: QLOGIC QLA2XXX - add Andrew Vasquez email address
MAINTAINERS: QLOGIC QLA3XXX - Add Ron Mercer email address
MAINTAINERS: Scott Murray is no longer with SomaNetworks scripts/get_maintainer.pl: Add -f directory use get_maintainer.pl: Add git-min-percent option

 CREDITS                   |    6 ++++
 MAINTAINERS               |   60 +++++++++++++++-----------------------------
 scripts/get_maintainer.pl |   42 ++++++++++++++++++++++++++-----
 3 files changed, 62 insertions(+), 46 deletions(-)
author maintainer
#4 lore raw

PATCH 4/16 MAINTAINERS: Use tabs in ACER ASPIRE ONE

---
 MAINTAINERS |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
MAINTAINERS +5 -5
index d8ade8d..5fc8219 100644
@@ -231,11 +231,11 @@ S:	Maintained
 F:	drivers/net/acenic*
 
 ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER
-P: Peter Feuerer
-M: [email protected]
-W: http://piie.net/?section=acerhdf
-S: Maintained
-F: drivers/platform/x86/acerhdf.c
+P:	Peter Feuerer
+M:	[email protected]
+W:	http://piie.net/?section=acerhdf
+S:	Maintained
+F:	drivers/platform/x86/acerhdf.c
 
 ACER WMI LAPTOP EXTRAS
 P:	Carlos Corbacho
Signature · 1 line
1.6.3.1.10.g659a0.dirty
author maintainer
#5 lore raw

PATCH 5/16 MAINTAINERS: Remove L: [email protected]

In reply to Joe Perches

from sections that should not have them.

---
 MAINTAINERS |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
MAINTAINERS +0 -5
index 5fc8219..4da4190 100644
@@ -2197,7 +2197,6 @@ F:	drivers/scsi/lpfc/
 ENE CB710 FLASH CARD READER DRIVER
 P:	Michał Mirosław
 M:	[email protected]
-L:	[email protected]
 S:	Maintained
 F:	drivers/misc/cb710/
 F:	drivers/mmc/host/cb710-mmc.*
@@ -3473,13 +3472,11 @@ P:	Vegard Nossum
 M:	[email protected]
 P	Pekka Enberg
 M:	[email protected]
-L:	[email protected]
 S:	Maintained
 
 KMEMLEAK
 P:	Catalin Marinas
 M:	[email protected]
-L:	[email protected]
 S:	Maintained
 F:	Documentation/kmemleak.txt
 F:	include/linux/kmemleak.h
@@ -4298,7 +4295,6 @@ F:	drivers/video/omap/
 OMAP MMC SUPPORT
 P:	Jarkko Lavinen
 M:	[email protected]
-L:	[email protected]
 L:	[email protected]
 S:	Maintained
 F:	drivers/mmc/host/*omap*
@@ -4580,7 +4576,6 @@ P:	Paul Mackerras
 M:	[email protected]
 P:	Ingo Molnar
 M:	[email protected]
-L:	[email protected]
 S:	Supported
 
 PERSONALITY HANDLING
Signature · 1 line
1.6.3.1.10.g659a0.dirty
author maintainer
#6 lore raw

PATCH 6/16 MAINTAINERS: Move ARPD to CREDITS

In reply to Joe Perches

Jonathan Layes is hard to find.

---
 CREDITS     |    3 +++
 MAINTAINERS |    6 ------
 2 files changed, 3 insertions(+), 6 deletions(-)
CREDITS +3 -0
index 2b88fb3..af93191 100644
@@ -2006,6 +2006,9 @@ E: [email protected]
 D: Soundblaster driver fixes, ISAPnP quirk
 S: California, USA
 
+N: Jonathan Layes
+D: ARPD support
+
 N: Tom Lees
 E: [email protected]
 W: http://www.lpsg.demon.co.uk/
MAINTAINERS +0 -6
index 4da4190..2851cec 100644
@@ -951,12 +951,6 @@ W:	http://www.arm.linux.org.uk/
 S:	Maintained
 F:	arch/arm/vfp/
 
-ARPD SUPPORT
-P:	Jonathan Layes
-L:	[email protected]
-S:	Maintained
-F:	net/ipv4/arp.c
-
 ASUS ACPI EXTRAS DRIVER
 P:	Corentin Chary
 M:	[email protected]
Signature · 1 line
1.6.3.1.10.g659a0.dirty
author maintainer
#16 lore raw

PATCH 16/16 get_maintainer.pl: Add git-min-percent option

In reply to Joe Perches

Allow an option to control the minimum percentage
of sign-offs required before being considered
a maintainer.

git-min-percent has a default value of 5

---
 scripts/get_maintainer.pl |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)
scripts/get_maintainer.pl +16 -3
index 7fc09fc..61ef275 100755
@@ -27,6 +27,7 @@ my $email_git = 1;
 my $email_git_penguin_chiefs = 0;
 my $email_git_min_signatures = 1;
 my $email_git_max_maintainers = 5;
+my $email_git_min_percent = 5;
 my $email_git_since = "1-year-ago";
 my $output_multiline = 1;
 my $output_separator = ", ";
@@ -65,6 +66,7 @@ if (!GetOptions(
 		'git-chief-penguins!' => \$email_git_penguin_chiefs,
 		'git-min-signatures=i' => \$email_git_min_signatures,
 		'git-max-maintainers=i' => \$email_git_max_maintainers,
+		'git-min-percent=i' => \$email_git_min_percent,
 		'git-since=s' => \$email_git_since,
 		'm!' => \$email_maintainer,
 		'n!' => \$email_usename,
@@ -307,6 +309,7 @@ MAINTAINER field selection options:
     --git-chief-penguins => include ${penguin_chiefs}
     --git-min-signatures => number of signatures required (default: 1)
     --git-max-maintainers => maximum maintainers to add (default: 5)
+    --git-min-percent => minimum percentage of commits required (default: 0)
     --git-since => git history to use (default: 1-year-ago)
     --m => include maintainer(s) if any
     --n => include name 'Full Name <addr\@domain.tld>'
@@ -497,6 +500,7 @@ sub recent_git_signoffs {
     my $output = "";
     my $count = 0;
     my @lines = ();
+    my $total_sign_offs;
 
     if (which("git") eq "") {
 	warn("$P: git not found.  Add --nogit to options?\n");
@@ -520,17 +524,26 @@ sub recent_git_signoffs {
     $output =~ s/^\s*//gm;
 
     @lines = split("\n", $output);
+
+    $total_sign_offs = 0;
+    foreach my $line (@lines) {
+	if ($line =~ m/([0-9]+)\s+(.*)/) {
+	    $total_sign_offs += $1;
+	} else {
+	    die("$P: Unexpected git output: ${line}\n");
+	}
+    }
+
     foreach my $line (@lines) {
 	if ($line =~ m/([0-9]+)\s+(.*)/) {
 	    my $sign_offs = $1;
 	    $line = $2;
 	    $count++;
 	    if ($sign_offs < $email_git_min_signatures ||
-	        $count > $email_git_max_maintainers) {
+	        $count > $email_git_max_maintainers ||
+		$sign_offs * 100 / $total_sign_offs < $email_git_min_percent) {
 		last;
 	    }
-	} else {
-	    die("$P: Unexpected git output: ${line}\n");
 	}
 	if ($line =~ m/(.+)<(.+)>/) {
 	    my $git_name = $1;
Signature · 1 line
1.6.3.1.10.g659a0.dirty
author maintainer
#15 lore raw

PATCH 15/16 scripts/get_maintainer.pl: Add -f directory use

In reply to Joe Perches

Don't require a specific file in a directory to be tested.

Also Arnd Bergmann pointed out that the MAINTAINERS pattern requirement that directory patterns have a trailing slash was unnecessary and was likely to be error prone. Removed that requirement.

---
 scripts/get_maintainer.pl |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)
scripts/get_maintainer.pl +19 -4
index 3e73314..7fc09fc 100755
@@ -13,7 +13,7 @@
 use strict;
 
 my $P = $0;
-my $V = '0.16';
+my $V = '0.17';
 
 use Getopt::Long qw(:config no_auto_abbrev);
 
@@ -132,6 +132,10 @@ while (<MAINT>) {
 	    $value =~ s@\.@\\\.@g;       ##Convert . to \.
 	    $value =~ s/\*/\.\*/g;       ##Convert * to .*
 	    $value =~ s/\?/\./g;         ##Convert ? to .
+	    ##if pattern is a directory and it lacks a trailing slash, add one
+	    if ((-d $value)) {
+		$value =~ s@([^/])$@$1/@;
+	    }
 	}
 	push(@typevalue, "$type:$value");
     } elsif (!/^(\s)*$/) {
@@ -146,8 +150,10 @@ close(MAINT);
 my @files = ();
 
 foreach my $file (@ARGV) {
-    next if ((-d $file));
-    if (!(-f $file)) {
+    ##if $file is a directory and it lacks a trailing slash, add one
+    if ((-d $file)) {
+	$file =~ s@([^/])$@$1/@;
+    } elsif (!(-f $file)) {
 	die "$P: file '${file}' not found\n";
     }
     if ($from_filename) {
@@ -292,7 +298,7 @@ sub file_match_pattern {
 sub usage {
     print <<EOT;
 usage: $P [options] patchfile
-       $P [options] -f file
+       $P [options] -f file|directory
 version: $V
 
 MAINTAINER field selection options:
@@ -322,6 +328,15 @@ Other options:
   --version => show version
   --help => show this help information
 
+Notes:
+  Using "-f directory" may give unexpected results:
+
+  Used with "--git", git signators for _all_ files in and below
+     directory are examined as git recurses directories.
+     Any specified X: (exclude) pattern matches are _not_ ignored.
+  Used with "--nogit", directory is used as a pattern match,
+     no individual file within the directory or subdirectory
+     is matched.
 EOT
 }
 
Signature · 1 line
1.6.3.1.10.g659a0.dirty
author maintainer
#7 lore raw

PATCH 7/16 MAINTAINERS: Update KERNEL JANITORS

In reply to Joe Perches
---
 MAINTAINERS |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
MAINTAINERS +2 -3
index 2851cec..108ae11 100644
@@ -3366,10 +3366,9 @@ F:	Makefile
 F:	scripts/Makefile.*
 
 KERNEL JANITORS
-P:	Several
 L:	[email protected]
-W:	http://www.kerneljanitors.org/
-S:	Maintained
+W:	http://janitor.kernelnewbies.org/
+S:	Odd fixes
 
 KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
 P:	J. Bruce Fields
Signature · 1 line
1.6.3.1.10.g659a0.dirty
author maintainer
#14 lore raw

PATCH 14/16 MAINTAINERS: Scott Murray is no longer with SomaNetworks

In reply to Joe Perches
---
 MAINTAINERS |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
MAINTAINERS +3 -6
index 1482180..5befb1c 100644
@@ -1546,26 +1546,23 @@ F:	fs/cifs/
 
 COMPACTPCI HOTPLUG CORE
 P:	Scott Murray
-M:	[email protected]
 M:	[email protected]
 L:	[email protected]
-S:	Supported
+S:	Maintained
 F:	drivers/pci/hotplug/cpci_hotplug*
 
 COMPACTPCI HOTPLUG ZIATECH ZT5550 DRIVER
 P:	Scott Murray
-M:	[email protected]
 M:	[email protected]
 L:	[email protected]
-S:	Supported
+S:	Maintained
 F:	drivers/pci/hotplug/cpcihp_zt5550.*
 
 COMPACTPCI HOTPLUG GENERIC DRIVER
 P:	Scott Murray
-M:	[email protected]
 M:	[email protected]
 L:	[email protected]
-S:	Supported
+S:	Maintained
 F:	drivers/pci/hotplug/cpcihp_generic.c
 
 COMPAL LAPTOP SUPPORT
Signature · 1 line
1.6.3.1.10.g659a0.dirty
author maintainer
#3 lore raw

PATCH 3/16 MAINTAINERS: QLGE 10Gb ETHERNET - pair P:/M: entries properly

In reply to Joe Perches
---
 MAINTAINERS |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
MAINTAINERS +1 -1
index ff4cd3b..d8ade8d 100644
@@ -4813,8 +4813,8 @@ F:	drivers/net/qla3xxx.*
 
 QLOGIC QLGE 10Gb ETHERNET DRIVER
 P:	Ron Mercer
-M:	[email protected]
 M:	[email protected]
+M:	[email protected]
 L:	[email protected]
 S:	Supported
 F:	drivers/net/qlge/
Signature · 1 line
1.6.3.1.10.g659a0.dirty
author maintainer
#2 lore raw

PATCH 2/16 MAINTAINERS: Remove ivtv-user lists, add CX18 url

In reply to Joe Perches
---
 MAINTAINERS |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
MAINTAINERS +1 -2
index 326c07e..ff4cd3b 100644
@@ -1721,10 +1721,10 @@ M:	[email protected]
 P:	Andy Walls
 M:	[email protected]
 L:	[email protected]
-L:	[email protected]
 L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:	http://linuxtv.org
+W:	http://www.ivtvdriver.org/index.php/Cx18
 S:	Maintained
 F:	Documentation/video4linux/cx18.txt
 F:	drivers/media/video/cx18/
@@ -3276,7 +3276,6 @@ IVTV VIDEO4LINUX DRIVER
 P:	Hans Verkuil
 M:	[email protected]
 L:	[email protected]
-L:	[email protected]
 L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:	http://www.ivtvdriver.org
Signature · 1 line
1.6.3.1.10.g659a0.dirty
author maintainer
#11 lore raw

PATCH 11/16 MAINTAINERS: Remove CS461x sound card section

In reply to Joe Perches

Thomas Woller's email address bounces
Nils Faerber isn't active

Added Thomas Woller to CREDITS, Nils already has an entry

---
 CREDITS     |    3 +++
 MAINTAINERS |    9 ---------
 2 files changed, 3 insertions(+), 9 deletions(-)
CREDITS +3 -0
index af93191..e0c5d9c 100644
@@ -3805,6 +3805,9 @@ S: van Bronckhorststraat 12
 S: 2612 XV Delft
 S: The Netherlands
 
+N: Thomas Woller
+D: CS461x Cirrus Logic sound driver
+
 N: David Woodhouse
 E: [email protected]
 D: JFFS2 file system, Memory Technology Device subsystem,
MAINTAINERS +0 -9
index 9ec53ae..2931717 100644
@@ -1508,15 +1508,6 @@ L:	[email protected] (moderated for non-subscribers)
 S:	Supported
 F:	sound/soc/codecs/cs4270*
 
-CIRRUS LOGIC CS4280/CS461x SOUNDDRIVER
-P:	Cirrus Logic Corporation (kernel 2.2 driver)
-M:	Cirrus Logic Corporation, Thomas Woller <[email protected]>
-P:	Nils Faerber (port to kernel 2.4)
-M:	Nils Faerber <[email protected]>
-S:	Maintained
-F:	Documentation/input/cs461x.txt
-F:	sound/pci/cs46xx/
-
 CLK API
 P:	Russell King
 M:	[email protected]
Signature · 1 line
1.6.3.1.10.g659a0.dirty
author maintainer
#1 lore raw

PATCH 1/16 MAINTAINERS: IA64 - pair P:/M: entries properly

In reply to Joe Perches
---
 MAINTAINERS |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
MAINTAINERS +1 -1
index 18c3f0c..326c07e 100644
@@ -2851,8 +2851,8 @@ S:	Maintained
 
 IA64 (Itanium) PLATFORM
 P:	Tony Luck
-P:	Fenghua Yu
 M:	[email protected]
+P:	Fenghua Yu
 M:	[email protected]
 L:	[email protected]
 W:	http://www.ia64-linux.org/
Signature · 1 line
1.6.3.1.10.g659a0.dirty
author maintainer
#10 lore raw

PATCH 10/16 MAINTAINERS: INPUT: Add Dmitry's name to his email address

In reply to Joe Perches
---
 MAINTAINERS |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
MAINTAINERS +1 -0
index 4f6b5e0..9ec53ae 100644
@@ -2972,6 +2972,7 @@ F:	include/linux/inotify.h
 INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS
 P:	Dmitry Torokhov
 M:	[email protected]
+P:	Dmitry Torokhov
 M:	[email protected]
 L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
Signature · 1 line
1.6.3.1.10.g659a0.dirty
author maintainer
#8 lore raw

PATCH 8/16 MAINTAINERS: Add PPS patterns

In reply to Joe Perches
---
 MAINTAINERS |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
MAINTAINERS +3 -0
index 108ae11..3bb2c93 100644
@@ -4659,6 +4659,9 @@ M:	[email protected]
 W:	http://wiki.enneenne.com/index.php/LinuxPPS_support
 L:	[email protected] (subscribers-only)
 S:	Maintained
+F:	Documentation/pps/
+F:	drivers/pps/
+F:	include/linux/pps*.h
 
 PREEMPTIBLE KERNEL
 P:	Robert Love
Signature · 1 line
1.6.3.1.10.g659a0.dirty
author maintainer
#9 lore raw

PATCH 9/16 MAINTAINERS: USB Serial Digi Acceleport: use separate P: for Al Borchers

In reply to Joe Perches
---
 MAINTAINERS |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
MAINTAINERS +2 -1
index 3bb2c93..4f6b5e0 100644
@@ -6098,8 +6098,9 @@ S:	Maintained
 F:	drivers/usb/serial/cyberjack.c
 
 USB SERIAL DIGI ACCELEPORT DRIVER
-P:	Peter Berger and Al Borchers
+P:	Peter Berger
 M:	[email protected]
+P:	Al Borchers
 M:	[email protected]
 L:	[email protected]
 S:	Maintained
Signature · 1 line
1.6.3.1.10.g659a0.dirty
author maintainer
#12 lore raw

PATCH 12/16 MAINTAINERS: QLOGIC QLA2 - add Andrew Vasquez email address

In reply to Joe Perches

Originally sent as QLOGIC QLA2XXX,
but vger doesn't like subjects that contain "XXX"

---
 MAINTAINERS |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
MAINTAINERS +1 -0
index 2931717..e6402fc 100644
@@ -4780,6 +4780,7 @@ S:	Maintained
 
 QLOGIC QLA2XXX FC-SCSI DRIVER
 P:	Andrew Vasquez
+M:	[email protected]
 M:	[email protected]
 L:	[email protected]
 S:	Supported
Signature · 1 line
1.6.3.1.10.g659a0.dirty
author maintainer
#13 lore raw

PATCH 13/16 MAINTAINERS: QLOGIC QLA3 - Add Ron Mercer email address

In reply to Joe Perches

Originally sent as QLOGIC QLA3XXX,
but vger doesn't like subjects with XXX

---
 MAINTAINERS |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
MAINTAINERS +1 -0
index e6402fc..1482180 100644
@@ -4789,6 +4789,7 @@ F:	drivers/scsi/qla2xxx/
 
 QLOGIC QLA3XXX NETWORK DRIVER
 P:	Ron Mercer
+M:	[email protected]
 M:	[email protected]
 L:	[email protected]
 S:	Supported
Signature · 1 line
1.6.3.1.10.g659a0.dirty
author maintainer
#17 lore raw

PATCH 1/1 MAINTAINERS: Coalesce name and email address lines

In reply to Joe Perches
Quoted 1 line · Joe Perches

A collection of cleanup patches to MAINTAINERS

I ran the script I submitted awhile back on MAINTAINERS after these [0/16] patches are applied.

http://lkml.org/lkml/2009/6/1/275

I think the result is useful for people that rely
on copy and paste of email addresses.

 MAINTAINERS | 2722 ++++++++++++++++++++---------------------------------------
 1 files changed, 908 insertions(+), 1814 deletions(-)
MAINTAINERS +908 -1814
index 5befb1c..f64b085 100644
@@ -73,8 +73,8 @@ Note: For the hard of thinking, this list is meant to remain in alphabetical
 order. If you could add yourselves to it in alphabetical order that would be
 so much easier [Ed]
 
-P: Person
-M: Mail patches to
+P: Person (obsolete)
+M: Mail patches to: FullName <address@domain>
 L: Mailing list that is relevant to this area
 W: Web-page with status/info
 T: SCM tree type and location.  Type is one of: git, hg, quilt, stgit.
@@ -104,67 +104,58 @@ X: Files and directories that are NOT maintained, same rules as F:
    matches all files in and below net excluding net/ipv6/
 
 3C505 NETWORK DRIVER
-P:	Philip Blundell
-M:	[email protected]
+M:	Philip Blundell <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/net/3c505*
 
 3C59X NETWORK DRIVER
-P:	Steffen Klassert
-M:	[email protected]
+M:	Steffen Klassert <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	Documentation/networking/vortex.txt
 F:	drivers/net/3c59x.c
 
 3CR990 NETWORK DRIVER
-P:	David Dillow
-M:	[email protected]
+M:	David Dillow <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/net/typhoon*
 
 3W-9XXX SATA-RAID CONTROLLER DRIVER
-P:	Adam Radford
-M:	[email protected]
+M:	Adam Radford <[email protected]>
 L:	[email protected]
 W:	http://www.amcc.com
 S:	Supported
 F:	drivers/scsi/3w-9xxx*
 
 3W-XXXX ATA-RAID CONTROLLER DRIVER
-P:	Adam Radford
-M:	[email protected]
+M:	Adam Radford <[email protected]>
 L:	[email protected]
 W:	http://www.amcc.com
 S:	Supported
 F:	drivers/scsi/3w-xxxx*
 
 53C700 AND 53C700-66 SCSI DRIVER
-P:	James E.J. Bottomley
-M:	[email protected]
+M:	"James E.J. Bottomley" <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/scsi/53c700*
 
 6PACK NETWORK DRIVER FOR AX.25
-P:	Andreas Koensgen
-M:	[email protected]
+M:	Andreas Koensgen <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/net/hamradio/6pack.c
 
 8169 10/100/1000 GIGABIT ETHERNET DRIVER
-P:	Francois Romieu
-M:	[email protected]
+M:	Francois Romieu <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/net/r8169.c
 
 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
-P:	Alan Cox
-M:	[email protected]
+M:	Alan Cox <[email protected]>
 L:	[email protected]
 W:	http://serial.sourceforge.net
 S:	Odd Fixes
@@ -172,20 +163,16 @@ F:	drivers/serial/8250*
 F:	include/linux/serial_8250.h
 
 8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.]
-P:	Paul Gortmaker
-M:	[email protected]
+M:	Paul Gortmaker <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/net/*8390*
 F:	drivers/net/ax88796.c
 
 9P FILE SYSTEM
-P:	Eric Van Hensbergen
-M:	[email protected]
-P:	Ron Minnich
-M:	[email protected]
-P:	Latchesar Ionkov
-M:	[email protected]
+M:	Eric Van Hensbergen <[email protected]>
+M:	Ron Minnich <[email protected]>
+M:	Latchesar Ionkov <[email protected]>
 L:	[email protected]
 W:	http://swik.net/v9fs
 T:	git git://git.kernel.org/pub/scm/linux/kernel/ericvh/v9fs.git
@@ -194,15 +181,13 @@ F:	Documentation/filesystems/9p.txt
 F:	fs/9p/
 
 A2232 SERIAL BOARD DRIVER
-P:	Enver Haase
-M:	[email protected]
+M:	Enver Haase <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/char/ser_a2232*
 
 AACRAID SCSI RAID DRIVER
-P:	Adaptec OEM Raid Solutions
-M:	[email protected]
+M:	Adaptec OEM Raid Solutions <[email protected]>
 L:	[email protected]
 W:	http://www.adaptec.com/
 S:	Supported
@@ -210,44 +195,38 @@ F:	Documentation/scsi/aacraid.txt
 F:	drivers/scsi/aacraid/
 
 ABIT UGURU 1,2 HARDWARE MONITOR DRIVER
-P:	Hans de Goede
-M:	[email protected]
+M:	Hans de Goede <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/hwmon/abituguru.c
 
 ABIT UGURU 3 HARDWARE MONITOR DRIVER
-P:	Alistair John Strachan
-M:	[email protected]
+M:	Alistair John Strachan <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/hwmon/abituguru3.c
 
 ACENIC DRIVER
-P:	Jes Sorensen
-M:	[email protected]
+M:	Jes Sorensen <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/net/acenic*
 
 ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER
-P:	Peter Feuerer
-M:	[email protected]
+M:	Peter Feuerer <[email protected]>
 W:	http://piie.net/?section=acerhdf
 S:	Maintained
 F:	drivers/platform/x86/acerhdf.c
 
 ACER WMI LAPTOP EXTRAS
-P:	Carlos Corbacho
-M:	[email protected]
+M:	Carlos Corbacho <[email protected]>
 L:	[email protected] (subscribers-only)
 W:	http://code.google.com/p/aceracpi
 S:	Maintained
 F:	drivers/platform/x86/acer-wmi.c
 
 ACPI
-P:	Len Brown
-M:	[email protected]
+M:	Len Brown <[email protected]>
 L:	[email protected]
 W:	http://www.lesswatts.org/projects/acpi/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
@@ -257,8 +236,7 @@ F:	drivers/pnp/pnpacpi/
 F:	include/linux/acpi.h
 
 ACPI BATTERY DRIVERS
-P:	Alexey Starikovskiy
-M:	[email protected]
+M:	Alexey Starikovskiy <[email protected]>
 L:	[email protected]
 W:	http://www.lesswatts.org/projects/acpi/
 S:	Supported
@@ -266,80 +244,69 @@ F:	drivers/acpi/battery.c
 F:	drivers/acpi/*sbs*
 
 ACPI EC DRIVER
-P:	Alexey Starikovskiy
-M:	[email protected]
+M:	Alexey Starikovskiy <[email protected]>
 L:	[email protected]
 W:	http://www.lesswatts.org/projects/acpi/
 S:	Supported
 F:	drivers/acpi/ec.c
 
 ACPI FAN DRIVER
-P:	Zhang Rui
-M:	[email protected]
+M:	Zhang Rui <[email protected]>
 L:	[email protected]
 W:	http://www.lesswatts.org/projects/acpi/
 S:	Supported
 F:	drivers/acpi/fan.c
 
 ACPI PCI HOTPLUG DRIVER
-P:	Kristen Carlson Accardi
-M:	[email protected]
+M:	Kristen Carlson Accardi <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	drivers/pci/hotplug/acpi*
 
 ACPI THERMAL DRIVER
-P:	Zhang Rui
-M:	[email protected]
+M:	Zhang Rui <[email protected]>
 L:	[email protected]
 W:	http://www.lesswatts.org/projects/acpi/
 S:	Supported
 F:	drivers/acpi/*thermal*
 
 ACPI VIDEO DRIVER
-P:	Zhang Rui
-M:	[email protected]
+M:	Zhang Rui <[email protected]>
 L:	[email protected]
 W:	http://www.lesswatts.org/projects/acpi/
 S:	Supported
 F:	drivers/acpi/video.c
 
 ACPI WMI DRIVER
-P:	Carlos Corbacho
-M:	[email protected]
+M:	Carlos Corbacho <[email protected]>
 L:	[email protected]
 W:	http://www.lesswatts.org/projects/acpi/
 S:	Maintained
 F:	drivers/platform/x86/wmi.c
 
 AD1889 ALSA SOUND DRIVER
-P:	Kyle McMartin
-M:	[email protected]
-P:	Thibaut Varene
-M:	[email protected]
+M:	Kyle McMartin <[email protected]>
+M:	Thibaut Varene <[email protected]>
 W:	http://wiki.parisc-linux.org/AD1889
 L:	[email protected]
 S:	Maintained
 F:	sound/pci/ad1889.*
 
 ADM1025 HARDWARE MONITOR DRIVER
-P:	Jean Delvare
-M:	[email protected]
+M:	Jean Delvare <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	Documentation/hwmon/adm1025
 F:	drivers/hwmon/adm1025.c
 
 ADM1029 HARDWARE MONITOR DRIVER
-P:	Corentin Labbe
-M:	[email protected]
+M:	Corentin Labbe <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/hwmon/adm1029.c
 
 ADM8211 WIRELESS DRIVER
-P:	Michael Wu
-M:	[email protected]
+M:	Michael Wu <[email protected]>
 L:	[email protected]
 W:	http://linuxwireless.org/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
@@ -347,35 +314,30 @@ S:	Maintained
 F:	drivers/net/wireless/adm8211.*
 
 ADT746X FAN DRIVER
-P:	Colin Leroy
-M:	[email protected]
+M:	Colin Leroy <[email protected]>
 S:	Maintained
 F:	drivers/macintosh/therm_adt746x.c
 
 ADVANSYS SCSI DRIVER
-P:	Matthew Wilcox
-M:	[email protected]
+M:	Matthew Wilcox <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	Documentation/scsi/advansys.txt
 F:	drivers/scsi/advansys.c
 
 AEDSP16 DRIVER
-P:	Riccardo Facchetti
-M:	[email protected]
+M:	Riccardo Facchetti <[email protected]>
 S:	Maintained
 F:	sound/oss/aedsp16.c
 
 AFFS FILE SYSTEM
-P:	Roman Zippel
-M:	[email protected]
+M:	Roman Zippel <[email protected]>
 S:	Maintained
 F:	Documentation/filesystems/affs.txt
 F:	fs/affs/
 
 AFS FILESYSTEM & AF_RXRPC SOCKET DOMAIN
-P:	David Howells
-M:	[email protected]
+M:	David Howells <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	fs/afs/
@@ -383,40 +345,35 @@ F:	include/net/af_rxrpc.h
 F:	net/rxrpc/af_rxrpc.c
 
 AGPGART DRIVER
-P:	David Airlie
-M:	[email protected]
+M:	David Airlie <[email protected]>
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git
 S:	Maintained
 F:	drivers/char/agp/
 F:	include/linux/agp*
 
 AHA152X SCSI DRIVER
-P:	Juergen E. Fischer
-M:	[email protected]
+M:	"Juergen E. Fischer" <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/scsi/aha152x*
 F:	drivers/scsi/pcmcia/aha152x*
 
 AIC7XXX / AIC79XX SCSI DRIVER
-P:	Hannes Reinecke
-M:	[email protected]
+M:	Hannes Reinecke <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/scsi/aic7xxx/
 F:	drivers/scsi/aic7xxx_old/
 
 AIO
-P:	Benjamin LaHaise
-M:	[email protected]
+M:	Benjamin LaHaise <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	fs/aio.c
 F:	include/linux/*aio*.h
 
 ALCATEL SPEEDTOUCH USB DRIVER
-P:	Duncan Sands
-M:	[email protected]
+M:	Duncan Sands <[email protected]>
 L:	[email protected]
 W:	http://www.linux-usb.org/SpeedTouch/
 S:	Maintained
@@ -424,32 +381,27 @@ F:	drivers/usb/atm/speedtch.c
 F:	drivers/usb/atm/usbatm.c
 
 ALCHEMY AU1XX0 MMC DRIVER
-P:	Manuel Lauss
-M:	[email protected]
+M:	Manuel Lauss <[email protected]>
 S:	Maintained
 F:	drivers/mmc/host/au1xmmc.c
 
 ALI1563 I2C DRIVER
-P:	Rudolf Marek
-M:	[email protected]
+M:	Rudolf Marek <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	Documentation/i2c/busses/i2c-ali1563
 F:	drivers/i2c/busses/i2c-ali1563.c
 
 ALPHA PORT
-P:	Richard Henderson
-M:	[email protected]
+M:	Richard Henderson <[email protected]>
 S:	Odd Fixes for 2.4; Maintained for 2.6.
-P:	Ivan Kokshaysky
-M:	[email protected]
+M:	Ivan Kokshaysky <[email protected]>
 S:	Maintained for 2.4; PCI support for 2.6.
 L:	[email protected]
 F:	arch/alpha/
 
 AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
-P:	Thomas Dahlmann
-M:	[email protected]
+M:	Thomas Dahlmann <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 S:	Supported
 F:	drivers/usb/gadget/amd5536udc.*
@@ -466,8 +418,7 @@ F:	drivers/video/geode/
 F:	arch/x86/include/asm/geode.h
 
 AMD IOMMU (AMD-VI)
-P:	Joerg Roedel
-M:	[email protected]
+M:	Joerg Roedel <[email protected]>
 L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git
 S:	Supported
@@ -475,40 +426,33 @@ F:	arch/x86/kernel/amd_iommu*.c
 F:	arch/x86/include/asm/amd_iommu*.h
 
 AMD MICROCODE UPDATE SUPPORT
-P:	Andreas Herrmann
-M:	[email protected]
+M:	Andreas Herrmann <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	arch/x86/kernel/microcode_amd.c
 
 AMS (Apple Motion Sensor) DRIVER
-P:	Stelian Pop
-M:	[email protected]
-P:	Michael Hanselmann
-M:	[email protected]
+M:	Stelian Pop <[email protected]>
+M:	Michael Hanselmann <[email protected]>
 S:	Supported
 F:	drivers/hwmon/ams/
 
 AMSO1100 RNIC DRIVER
-P:	Tom Tucker
-M:	[email protected]
-P:	Steve Wise
-M:	[email protected]
+M:	Tom Tucker <[email protected]>
+M:	Steve Wise <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/infiniband/hw/amso1100/
 
 AOA (Apple Onboard Audio) ALSA DRIVER
-P:	Johannes Berg
-M:	[email protected]
+M:	Johannes Berg <[email protected]>
 L:	[email protected]
 L:	[email protected] (moderated for non-subscribers)
 S:	Maintained
 F:	sound/aoa/
 
 APM DRIVER
-P:	Stephen Rothwell
-M:	[email protected]
+M:	Stephen Rothwell <[email protected]>
 L:	[email protected]
 W:	http://www.canb.auug.org.au/~sfr/
 S:	Supported
@@ -516,51 +460,44 @@ F:	arch/x86/kernel/apm_32.c
 F:	include/linux/apm_bios.h
 
 APPLE BCM5974 MULTITOUCH DRIVER
-P:	Henrik Rydberg
-M:	[email protected]
+M:	Henrik Rydberg <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/input/mouse/bcm5974.c
 
 APPLE SMC DRIVER
-P:	Nicolas Boichat
-M:	[email protected]
+M:	Nicolas Boichat <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/hwmon/applesmc.c
 
 APPLETALK NETWORK LAYER
-P:	Arnaldo Carvalho de Melo
-M:	[email protected]
+M:	Arnaldo Carvalho de Melo <[email protected]>
 S:	Maintained
 F:	drivers/net/appletalk/
 F:	net/appletalk/
 
 APPLETOUCH TOUCHPAD DRIVER
-P:	Johannes Berg
-M:	[email protected]
+M:	Johannes Berg <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	Documentation/input/appletouch.txt
 F:	drivers/input/mouse/appletouch.c
 
 ARC FRAMEBUFFER DRIVER
-P:	Jaya Kumar
-M:	[email protected]
+M:	Jaya Kumar <[email protected]>
 S:	Maintained
 F:	drivers/video/arcfb.c
 F:	drivers/video/fb_defio.c
 
 ARM MFM AND FLOPPY DRIVERS
-P:	Ian Molton
-M:	[email protected]
+M:	Ian Molton <[email protected]>
 S:	Maintained
 F:	arch/arm/lib/floppydma.S
 F:	arch/arm/include/asm/floppy.h
 
 ARM PORT
-P:	Russell King
-M:	[email protected]
+M:	Russell King <[email protected]>
 L:	[email protected]	(subscribers-only)
 W:	http://www.arm.linux.org.uk/
 S:	Maintained
@@ -571,79 +508,67 @@ S:	Orphan
 F:	drivers/mmc/host/mmci.*
 
 ARM/ADI ROADRUNNER MACHINE SUPPORT
-P:	Lennert Buytenhek
-M:	[email protected]
+M:	Lennert Buytenhek <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Maintained
 F:	arch/arm/mach-ixp23xx/
 F:	arch/arm/mach-ixp23xx/include/mach/
 
 ARM/ADS SPHERE MACHINE SUPPORT
-P:	Lennert Buytenhek
-M:	[email protected]
+M:	Lennert Buytenhek <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Maintained
 
 ARM/AFEB9260 MACHINE SUPPORT
-P:	Sergey Lapin
-M:	[email protected]
+M:	Sergey Lapin <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Maintained
 
 ARM/AJECO 1ARM MACHINE SUPPORT
-P:	Lennert Buytenhek
-M:	[email protected]
+M:	Lennert Buytenhek <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Maintained
 
 ARM/ATMEL AT91RM9200 ARM ARCHITECTURE
-P:	Andrew Victor
-M:	[email protected]
+M:	Andrew Victor <[email protected]>
 L:	[email protected] (subscribers-only)
 W:	http://maxim.org.za/at91_26.html
 S:	Maintained
 
 ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
-P:	Lennert Buytenhek
-M:	[email protected]
+M:	Lennert Buytenhek <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Maintained
 
 ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT
-P:	Lennert Buytenhek
-M:	[email protected]
+M:	Lennert Buytenhek <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Maintained
 
 ARM/CLKDEV SUPPORT
-P:	Russell King
-M:	[email protected]
+M:	Russell King <[email protected]>
 L:	[email protected]	(subscribers-only)
 F:	arch/arm/common/clkdev.c
 F:	arch/arm/include/asm/clkdev.h
 
 ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT
-P:	Mike Rapoport
-M:	[email protected]
+M:	Mike Rapoport <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Maintained
 
 ARM/CORGI MACHINE SUPPORT
-P:	Richard Purdie
-M:	[email protected]
+M:	Richard Purdie <[email protected]>
 S:	Maintained
 
 ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
-P:	Paulius Zaleckas
-M:	[email protected]
+M:	Paulius Zaleckas <[email protected]>
 L:	[email protected] (subscribers-only)
 T:	git git://gitorious.org/linux-gemini/mainline.git
 S:	Maintained
 F:	arch/arm/mach-gemini/
 
 ARM/EBSA110 MACHINE SUPPORT
-P:	Russell King
-M:	[email protected]
+M:	Russell King <[email protected]>
 L:	[email protected]	(subscribers-only)
 W:	http://www.arm.linux.org.uk/
 S:	Maintained
@@ -651,12 +576,9 @@ F:	arch/arm/mach-ebsa110/
 F:	drivers/net/arm/am79c961a.*
 
 ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
-P:	Daniel Ribeiro
-M:	[email protected]
-P:	Stefan Schmidt
-M:	[email protected]
-P:	Harald Welte
-M:	[email protected]
+M:	Daniel Ribeiro <[email protected]>
+M:	Stefan Schmidt <[email protected]>
+M:	Harald Welte <[email protected]>
 L:	[email protected] (subscribers-only)
 W:	http://www.openezx.org/
 S:	Maintained
@@ -664,15 +586,13 @@ T:	topgit git://git.openezx.org/openezx.git
 F:	arch/arm/mach-pxa/ezx.c
 
 ARM/FARADAY FA526 PORT
-P:	Paulius Zaleckas
-M:	[email protected]
+M:	Paulius Zaleckas <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Maintained
 F:	arch/arm/mm/*-fa*
 
 ARM/FOOTBRIDGE ARCHITECTURE
-P:	Russell King
-M:	[email protected]
+M:	Russell King <[email protected]>
 L:	[email protected]	(subscribers-only)
 W:	http://www.arm.linux.org.uk/
 S:	Maintained
@@ -680,175 +600,143 @@ F:	arch/arm/include/asm/hardware/dec21285.h
 F:	arch/arm/mach-footbridge/
 
 ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
-P:	Sascha Hauer
-M:	[email protected]
+M:	Sascha Hauer <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Maintained
 
 ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
-P:	Lennert Buytenhek
-M:	[email protected]
+M:	Lennert Buytenhek <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Maintained
 
 ARM/GUMSTIX MACHINE SUPPORT
-P:	Steve Sakoman
-M:	[email protected]
+M:	Steve Sakoman <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Maintained
 
 ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT
-P:	Philipp Zabel
-M:	[email protected]
+M:	Philipp Zabel <[email protected]>
 S:	Maintained
 F:	arch/arm/mach-pxa/hx4700.c
 F:	arch/arm/mach-pxa/include/mach/hx4700.h
 
 ARM/HP JORNADA 7XX MACHINE SUPPORT
-P:	Kristoffer Ericson
-M:	[email protected]
+M:	Kristoffer Ericson <[email protected]>
 W:	www.jlime.com
 S:	Maintained
 
 ARM/INTEL IOP32X ARM ARCHITECTURE
-P:	Lennert Buytenhek
-M:	[email protected]
-P:	Dan Williams
-M:	[email protected]
+M:	Lennert Buytenhek <[email protected]>
+M:	Dan Williams <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Supported
 
 ARM/INTEL IOP33X ARM ARCHITECTURE
-P:	Dan Williams
-M:	[email protected]
+M:	Dan Williams <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Supported
 
 ARM/INTEL IOP13XX ARM ARCHITECTURE
-P:	Lennert Buytenhek
-M:	[email protected]
-P:	Dan Williams
-M:	[email protected]
+M:	Lennert Buytenhek <[email protected]>
+M:	Dan Williams <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Supported
 
 ARM/INTEL IQ81342EX MACHINE SUPPORT
-P:	Lennert Buytenhek
-M:	[email protected]
-P:	Dan Williams
-M:	[email protected]
+M:	Lennert Buytenhek <[email protected]>
+M:	Dan Williams <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Supported
 
 ARM/INTEL IXP2000 ARM ARCHITECTURE
-P:	Lennert Buytenhek
-M:	[email protected]
+M:	Lennert Buytenhek <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Maintained
 
 ARM/INTEL IXDP2850 MACHINE SUPPORT
-P:	Lennert Buytenhek
-M:	[email protected]
+M:	Lennert Buytenhek <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Maintained
 
 ARM/INTEL IXP23XX ARM ARCHITECTURE
-P:	Lennert Buytenhek
-M:	[email protected]
+M:	Lennert Buytenhek <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Maintained
 
 ARM/INTEL XSC3 (MANZANO) ARM CORE
-P:	Lennert Buytenhek
-M:	[email protected]
-P:	Dan Williams
-M:	[email protected]
+M:	Lennert Buytenhek <[email protected]>
+M:	Dan Williams <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Supported
 
 ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT
-P:	Lennert Buytenhek
-M:	[email protected]
+M:	Lennert Buytenhek <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Maintained
 
 ARM/LOGICPD PXA270 MACHINE SUPPORT
-P:	Lennert Buytenhek
-M:	[email protected]
+M:	Lennert Buytenhek <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Maintained
 
 ARM/MAGICIAN MACHINE SUPPORT
-P:	Philipp Zabel
-M:	[email protected]
+M:	Philipp Zabel <[email protected]>
 S:	Maintained
 
 ARM/MIOA701 MACHINE SUPPORT
-P:	Robert Jarzmik
-M:	[email protected]
+M:	Robert Jarzmik <[email protected]>
 L:	[email protected] (subscribers-only)
 F:	arch/arm/mach-pxa/mioa701.c
 S:	Maintained
 
 ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
-P:	Michael Petchkovsky
-M:	[email protected]
+M:	Michael Petchkovsky <[email protected]>
 S:	Maintained
 
 ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
-P:	Nelson Castillo
-M:	[email protected]
+M:	Nelson Castillo <[email protected]>
 L:	[email protected] (subscribers-only)
 W:	http://wiki.openmoko.org/wiki/Neo_FreeRunner
 S:	Supported
 
 ARM/TOSA MACHINE SUPPORT
-P:	Dmitry Eremin-Solenikov
-M:	[email protected]
-P:	Dirk Opfer
-M:	[email protected]
+M:	Dmitry Eremin-Solenikov <[email protected]>
+M:	Dirk Opfer <[email protected]>
 S:	Maintained
 
 ARM/PALMTX,PALMT5,PALMLD,PALMTE2 SUPPORT
-P:	Marek Vasut
-M:	[email protected]
+M:	Marek Vasut <[email protected]>
 W:	http://hackndev.com
 S:	Maintained
 
 ARM/PALM TREO 680 SUPPORT
-P:	Tomas Cech
-M:	[email protected]
+M:	Tomas Cech <[email protected]>
 W:	http://hackndev.com
 S:	Maintained
 
 ARM/PALMZ72 SUPPORT
-P:	Sergey Lapin
-M:	[email protected]
+M:	Sergey Lapin <[email protected]>
 W:	http://hackndev.com
 S:	Maintained
 
 ARM/PLEB SUPPORT
-P:	Peter Chubb
-M:	[email protected]
+M:	Peter Chubb <[email protected]>
 W:	http://www.disy.cse.unsw.edu.au/Hardware/PLEB
 S:	Maintained
 
 ARM/PT DIGITAL BOARD PORT
-P:	Stefan Eletzhofer
-M:	[email protected]
+M:	Stefan Eletzhofer <[email protected]>
 L:	[email protected]	(subscribers-only)
 W:	http://www.arm.linux.org.uk/
 S:	Maintained
 
 ARM/RADISYS ENP2611 MACHINE SUPPORT
-P:	Lennert Buytenhek
-M:	[email protected]
+M:	Lennert Buytenhek <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Maintained
 
 ARM/RISCPC ARCHITECTURE
-P:	Russell King
-M:	[email protected]
+M:	Russell King <[email protected]>
 L:	[email protected]	(subscribers-only)
 W:	http://www.arm.linux.org.uk/
 S:	Maintained
@@ -862,14 +750,12 @@ F:	drivers/net/arm/ether*
 F:	drivers/scsi/arm/
 
 ARM/SHARK MACHINE SUPPORT
-P:	Alexander Schulz
-M:	[email protected]
+M:	Alexander Schulz <[email protected]>
 W:	http://www.shark-linux.de/shark.html
 S:	Maintained
 
 ARM/SAMSUNG ARM ARCHITECTURES
-P:	Ben Dooks
-M:	[email protected]
+M:	Ben Dooks <[email protected]>
 L:	[email protected]	(subscribers-only)
 W:	http://www.fluff.org/ben/linux/
 S:	Maintained
@@ -877,85 +763,73 @@ F:	arch/arm/plat-s3c/
 F:	arch/arm/plat-s3c24xx/
 
 ARM/S3C2410 ARM ARCHITECTURE
-P:	Ben Dooks
-M:	[email protected]
+M:	Ben Dooks <[email protected]>
 L:	[email protected]	(subscribers-only)
 W:	http://www.fluff.org/ben/linux/
 S:	Maintained
 F:	arch/arm/mach-s3c2410/
 
 ARM/S3C2440 ARM ARCHITECTURE
-P:	Ben Dooks
-M:	[email protected]
+M:	Ben Dooks <[email protected]>
 L:	[email protected]	(subscribers-only)
 W:	http://www.fluff.org/ben/linux/
 S:	Maintained
 F:	arch/arm/mach-s3c2440/
 
 ARM/S3C2442 ARM ARCHITECTURE
-P:	Ben Dooks
-M:	[email protected]
+M:	Ben Dooks <[email protected]>
 L:	[email protected]	(subscribers-only)
 W:	http://www.fluff.org/ben/linux/
 S:	Maintained
 F:	arch/arm/mach-s3c2442/
 
 ARM/S3C2443 ARM ARCHITECTURE
-P:	Ben Dooks
-M:	[email protected]
+M:	Ben Dooks <[email protected]>
 L:	[email protected]	(subscribers-only)
 W:	http://www.fluff.org/ben/linux/
 S:	Maintained
 F:	arch/arm/mach-s3c2443/
 
 ARM/S3C6400 ARM ARCHITECTURE
-P:	Ben Dooks
-M:	[email protected]
+M:	Ben Dooks <[email protected]>
 L:	[email protected]	(subscribers-only)
 W:	http://www.fluff.org/ben/linux/
 S:	Maintained
 F:	arch/arm/mach-s3c6400/
 
 ARM/S3C6410 ARM ARCHITECTURE
-P:	Ben Dooks
-M:	[email protected]
+M:	Ben Dooks <[email protected]>
 L:	[email protected]	(subscribers-only)
 W:	http://www.fluff.org/ben/linux/
 S:	Maintained
 F:	arch/arm/mach-s3c6410/
 
 ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
-P:	Lennert Buytenhek
-M:	[email protected]
+M:	Lennert Buytenhek <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Maintained
 
 ARM/THECUS N2100 MACHINE SUPPORT
-P:	Lennert Buytenhek
-M:	[email protected]
+M:	Lennert Buytenhek <[email protected]>
 L:	[email protected] (subscribers-only)
 S:	Maintained
 
 ARM/NUVOTON W90X900 ARM ARCHITECTURE
-P:	Wan ZongShun
-M:	[email protected]
+M:	Wan ZongShun <[email protected]>
 L:	[email protected] (subscribers-only)
 W:	http://www.mcuos.com
 S:	Maintained
 
 ARM/VFP SUPPORT
-P:	Russell King
-M:	[email protected]
+M:	Russell King <[email protected]>
 L:	[email protected]	(subscribers-only)
 W:	http://www.arm.linux.org.uk/
 S:	Maintained
 F:	arch/arm/vfp/
 
 ASUS ACPI EXTRAS DRIVER
-P:	Corentin Chary
-M:	[email protected]
-P:	Karol Kozimor
-M:	[email protected]
+M:	Corentin Chary <[email protected]>
+M:	Karol Kozimor <[email protected]>
 L:	[email protected]
 W:	http://acpi4asus.sf.net
 S:	Maintained
@@ -963,25 +837,21 @@ F:	arch/x86/kernel/acpi/boot.c
 F:	drivers/platform/x86/asus_acpi.c
 
 ASUS ASB100 HARDWARE MONITOR DRIVER
-P:	Mark M. Hoffman
-M:	[email protected]
+M:	"Mark M. Hoffman" <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/hwmon/asb100.c
 
 ASUS LAPTOP EXTRAS DRIVER
-P:	Corentin Chary
-M:	[email protected]
+M:	Corentin Chary <[email protected]>
 L:	[email protected]
 W:	http://acpi4asus.sf.net
 S:	Maintained
 F:	drivers/platform/x86/asus-laptop.c
 
 ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
-P:	Dan Williams
-M:	[email protected]
-P:	Maciej Sosnowski
-M:	[email protected]
+M:	Dan Williams <[email protected]>
+M:	Maciej Sosnowski <[email protected]>
 W:	http://sourceforge.net/projects/xscaleiop
 S:	Supported
 F:	Documentation/crypto/async-tx-api.txt
@@ -991,64 +861,49 @@ F:	include/linux/dmaengine.h
 F:	include/linux/async_tx.h
 
 ATA OVER ETHERNET (AOE) DRIVER
-P:	Ed L. Cashin
-M:	[email protected]
+M:	"Ed L. Cashin" <[email protected]>
 W:	http://www.coraid.com/support/linux
 S:	Supported
 F:	Documentation/aoe/
 F:	drivers/block/aoe/
 
 ATHEROS ATH5K WIRELESS DRIVER
-P:	Jiri Slaby
-M:	[email protected]
-P:	Nick Kossifidis
-M:	[email protected]
-P:	Luis R. Rodriguez
-M:	[email protected]
-P:	Bob Copeland
-M:	[email protected]
+M:	Jiri Slaby <[email protected]>
+M:	Nick Kossifidis <[email protected]>
+M:	"Luis R. Rodriguez" <[email protected]>
+M:	Bob Copeland <[email protected]>
 L:	[email protected]
 L:	[email protected]
 S:	Maintained
 F:	drivers/net/wireless/ath/ath5k/
 
 ATHEROS ATH9K WIRELESS DRIVER
-P:	Luis R. Rodriguez
-M:	[email protected]
-P:	Jouni Malinen
-M:	[email protected]
-P:	Sujith Manoharan
-M:	[email protected]
-P:	Vasanthakumar Thiagarajan
-M:	[email protected]
-P:	Senthil Balasubramanian
-M:	[email protected]
+M:	"Luis R. Rodriguez" <[email protected]>
+M:	Jouni Malinen <[email protected]>
+M:	Sujith Manoharan <[email protected]>
+M:	Vasanthakumar Thiagarajan <[email protected]>
+M:	Senthil Balasubramanian <[email protected]>
 L:	[email protected]
 L:	[email protected]
 S:	Supported
 F:	drivers/net/wireless/ath/ath9k/
 
 ATHEROS AR9170 WIRELESS DRIVER
-P:	Christian Lamparter
-M:	[email protected]
+M:	Christian Lamparter <[email protected]>
 L:	[email protected]
 W:	http://wireless.kernel.org/en/users/Drivers/ar9170
 S:	Maintained
 F:	drivers/net/wireless/ath/ar9170/
 
 ATI_REMOTE2 DRIVER
-P:	Ville Syrjala
-M:	[email protected]
+M:	Ville Syrjala <[email protected]>
 S:	Maintained
 F:	drivers/input/misc/ati_remote2.c
 
 ATLX ETHERNET DRIVERS
-P:	Jay Cliburn
-M:	[email protected]
-P:	Chris Snook
-M:	[email protected]
-P:	Jie Yang
-M:	[email protected]
+M:	Jay Cliburn <[email protected]>
+M:	Chris Snook <[email protected]>
+M:	Jie Yang <[email protected]>
 L:	[email protected]
 W:	http://sourceforge.net/projects/atl1
 W:	http://atl1.sourceforge.net
@@ -1056,8 +911,7 @@ S:	Maintained
 F:	drivers/net/atlx/
 
 ATM
-P:	Chas Williams
-M:	[email protected]
+M:	Chas Williams <[email protected]>
 L:	[email protected] (subscribers-only)
 L:	[email protected]
 W:	http://linux-atm.sourceforge.net
@@ -1066,8 +920,7 @@ F:	drivers/atm/
 F:	include/linux/atm*
 
 ATMEL AT91 MCI DRIVER
-P:	Nicolas Ferre
-M:	[email protected]
+M:	Nicolas Ferre <[email protected]>
 L:	[email protected] (subscribers-only)
 W:	http://www.atmel.com/products/AT91/
 W:	http://www.at91.com/
@@ -1075,49 +928,42 @@ S:	Maintained
 F:	drivers/mmc/host/at91_mci.c
 
 ATMEL AT91 / AT32 MCI DRIVER
-P:	Nicolas Ferre
-M:	[email protected]
+M:	Nicolas Ferre <[email protected]>
 S:	Maintained
 F:	drivers/mmc/host/atmel-mci.c
 F:	drivers/mmc/host/atmel-mci-regs.h
 
 ATMEL AT91 / AT32 SERIAL DRIVER
-P:	Haavard Skinnemoen
-M:	[email protected]
+M:	Haavard Skinnemoen <[email protected]>
 S:	Supported
 F:	drivers/serial/atmel_serial.c
 
 ATMEL LCDFB DRIVER
-P:	Nicolas Ferre
-M:	[email protected]
+M:	Nicolas Ferre <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 S:	Maintained
 F:	drivers/video/atmel_lcdfb.c
 F:	include/video/atmel_lcdc.h
 
 ATMEL MACB ETHERNET DRIVER
-P:	Haavard Skinnemoen
-M:	[email protected]
+M:	Haavard Skinnemoen <[email protected]>
 S:	Supported
 F:	drivers/net/macb.*
 
 ATMEL SPI DRIVER
-P:	Haavard Skinnemoen
-M:	[email protected]
+M:	Haavard Skinnemoen <[email protected]>
 S:	Supported
 F:	drivers/spi/atmel_spi.*
 
 ATMEL USBA UDC DRIVER
-P:	Haavard Skinnemoen
-M:	[email protected]
+M:	Haavard Skinnemoen <[email protected]>
 L:	[email protected]
 W:	http://avr32linux.org/twiki/bin/view/Main/AtmelUsbDeviceDriver
 S:	Supported
 F:	drivers/usb/gadget/atmel_usba_udc.*
 
 ATMEL WIRELESS DRIVER
-P:	Simon Kelley
-M:	[email protected]
+M:	Simon Kelley <[email protected]>
 L:	[email protected]
 W:	http://www.thekelleys.org.uk/atmel
 W:	http://atmelwlandriver.sourceforge.net/
@@ -1125,10 +971,8 @@ S:	Maintained
 F:	drivers/net/wireless/atmel*
 
 AUDIT SUBSYSTEM
-P:	Al Viro
-M:	[email protected]
-P:	Eric Paris
-M:	[email protected]
+M:	Al Viro <[email protected]>
+M:	Eric Paris <[email protected]>
 L:	[email protected] (subscribers-only)
 W:	http://people.redhat.com/sgrubb/audit/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git
@@ -1137,8 +981,7 @@ F:	include/linux/audit.h
 F:	kernel/audit*
 
 AUXILIARY DISPLAY DRIVERS
-P:	Miguel Ojeda Sandonis
-M:	[email protected]
+M:	Miguel Ojeda Sandonis <[email protected]>
 W:	http://miguelojeda.es/auxdisplay.htm
 W:	http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
 S:	Maintained
@@ -1146,8 +989,7 @@ F:	drivers/auxdisplay/
 F:	include/linux/cfag12864b.h
 
 AVR32 ARCHITECTURE
-P:	Haavard Skinnemoen
-M:	[email protected]
+M:	Haavard Skinnemoen <[email protected]>
 W:	http://www.atmel.com/products/AVR32/
 W:	http://avr32linux.org/
 W:	http://avrfreaks.net/
@@ -1155,14 +997,12 @@ S:	Supported
 F:	arch/avr32/
 
 AVR32/AT32AP MACHINE SUPPORT
-P:	Haavard Skinnemoen
-M:	[email protected]
+M:	Haavard Skinnemoen <[email protected]>
 S:	Supported
 F:	arch/avr32/mach-at32ap/
 
 AX.25 NETWORK LAYER
-P:	Ralf Baechle
-M:	[email protected]
+M:	Ralf Baechle <[email protected]>
 L:	[email protected]
 W:	http://www.linux-ax25.org/
 S:	Maintained
@@ -1171,128 +1011,110 @@ F:	include/net/ax25.h
 F:	net/ax25/
 
 B43 WIRELESS DRIVER
-P:	Michael Buesch
-M:	[email protected]
-P:	Stefano Brivio
-M:	[email protected]
+M:	Michael Buesch <[email protected]>
+M:	Stefano Brivio <[email protected]>
 L:	[email protected]
 W:	http://linuxwireless.org/en/users/Drivers/b43
 S:	Maintained
 F:	drivers/net/wireless/b43/
 
 B43LEGACY WIRELESS DRIVER
-P:	Larry Finger
-M:	[email protected]
-P:	Stefano Brivio
-M:	[email protected]
+M:	Larry Finger <[email protected]>
+M:	Stefano Brivio <[email protected]>
 L:	[email protected]
 W:	http://linuxwireless.org/en/users/Drivers/b43
 S:	Maintained
 F:	drivers/net/wireless/b43legacy/
 
 BACKLIGHT CLASS/SUBSYSTEM
-P:	Richard Purdie
-M:	[email protected]
+M:	Richard Purdie <[email protected]>
 S:	Maintained
 F:	drivers/video/backlight/
 F:	include/linux/backlight.h
 
 BAYCOM/HDLCDRV DRIVERS FOR AX.25
-P:	Thomas Sailer
-M:	[email protected]
+M:	Thomas Sailer <[email protected]>
 L:	[email protected]
 W:	http://www.baycom.org/~tom/ham/ham.html
 S:	Maintained
 F:	drivers/net/hamradio/baycom*
 
 BEFS FILE SYSTEM
-P:	Sergey S. Kostyliov
-M:	[email protected]
+M:	"Sergey S. Kostyliov" <[email protected]>
 S:	Maintained
 F:	Documentation/filesystems/befs.txt
 F:	fs/befs/
 
 BFS FILE SYSTEM
-P:	Tigran A. Aivazian
-M:	[email protected]
+M:	"Tigran A. Aivazian" <[email protected]>
 S:	Maintained
 F:	Documentation/filesystems/bfs.txt
 F:	fs/bfs/
 F:	include/linux/bfs_fs.h
 
 BLACKFIN ARCHITECTURE
-P:	Mike Frysinger
-M:	[email protected]
+M:	Mike Frysinger <[email protected]>
 L:	[email protected]
 W:	http://blackfin.uclinux.org
 S:	Supported
 F:	arch/blackfin/
 
 BLACKFIN EMAC DRIVER
-P:	Michael Hennerich
-M:	[email protected]
+M:	Michael Hennerich <[email protected]>
 L:	[email protected]
 W:	http://blackfin.uclinux.org
 S:	Supported
 F:	drivers/net/bfin_mac.*
 
 BLACKFIN RTC DRIVER
-P:	Mike Frysinger
-M:	[email protected]
+M:	Mike Frysinger <[email protected]>
 L:	[email protected]
 W:	http://blackfin.uclinux.org
 S:	Supported
 F:	drivers/rtc/rtc-bfin.c
 
 BLACKFIN SERIAL DRIVER
-P:	Sonic Zhang
-M:	[email protected]
+M:	Sonic Zhang <[email protected]>
 L:	[email protected]
 W:	http://blackfin.uclinux.org
 S:	Supported
 F:	drivers/serial/bfin_5xx.c
 
 BLACKFIN WATCHDOG DRIVER
-P:	Mike Frysinger
-M:	[email protected]
+M:	Mike Frysinger <[email protected]>
 L:	[email protected]
 W:	http://blackfin.uclinux.org
 S:	Supported
 F:	drivers/watchdog/bfin_wdt.c
 
 BLACKFIN I2C TWI DRIVER
-P:	Sonic Zhang
-M:	[email protected]
+M:	Sonic Zhang <[email protected]>
 L:	[email protected]
 W:	http://blackfin.uclinux.org/
 S:	Supported
 F:	drivers/i2c/busses/i2c-bfin-twi.c
 
 BLOCK LAYER
-P:	Jens Axboe
-M:	[email protected]
+M:	Jens Axboe <[email protected]>
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git
 S:	Maintained
 F:	block/
 
 BLOCK2MTD DRIVER
-P:	Joern Engel
-M:	[email protected]
+M:	Joern Engel <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/mtd/devices/block2mtd.c
 
 BLUETOOTH DRIVERS
-P:	Marcel Holtmann
-M:	[email protected]
+M:	Marcel Holtmann <[email protected]>
 L:	[email protected]
 W:	http://www.bluez.org/
 S:	Maintained
 F:	drivers/bluetooth/
 
 BLUETOOTH SUBSYSTEM
-P:	Marcel Holtmann
-M:	[email protected]
+M:	Marcel Holtmann <[email protected]>
 L:	[email protected]
 W:	http://www.bluez.org/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git
@@ -1301,8 +1123,7 @@ F:	net/bluetooth/
 F:	include/net/bluetooth/
 
 BONDING DRIVER
-P:	Jay Vosburgh
-M:	[email protected]
+M:	Jay Vosburgh <[email protected]>
 L:	[email protected]
 W:	http://sourceforge.net/projects/bonding/
 S:	Supported
@@ -1310,54 +1131,46 @@ F:	drivers/net/bonding/
 F:	include/linux/if_bonding.h
 
 BROADCOM B44 10/100 ETHERNET DRIVER
-P:	Gary Zambrano
-M:	[email protected]
+M:	Gary Zambrano <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	drivers/net/b44.*
 
 BROADCOM BNX2 GIGABIT ETHERNET DRIVER
-P:	Michael Chan
-M:	[email protected]
+M:	Michael Chan <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	drivers/net/bnx2.*
 F:	drivers/net/bnx2_*
 
 BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
-P:	Eilon Greenstein
-M:	[email protected]
+M:	Eilon Greenstein <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	drivers/net/bnx2x*
 
 BROADCOM TG3 GIGABIT ETHERNET DRIVER
-P:	Matt Carlson
-M:	[email protected]
-P:	Michael Chan
-M:	[email protected]
+M:	Matt Carlson <[email protected]>
+M:	Michael Chan <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	drivers/net/tg3.*
 
 BSG (block layer generic sg v4 driver)
-P:	FUJITA Tomonori
-M:	[email protected]
+M:	FUJITA Tomonori <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	block/bsg.c
 F:	include/linux/bsg.h
 
 BT8XXGPIO DRIVER
-P:	Michael Buesch
-M:	[email protected]
+M:	Michael Buesch <[email protected]>
 W:	http://bu3sch.de/btgpio.php
 S:	Maintained
 F:	drivers/gpio/bt8xxgpio.c
 
 BTRFS FILE SYSTEM
-P:	Chris Mason
-M:	[email protected]
+M:	Chris Mason <[email protected]>
 L:	[email protected]
 W:	http://btrfs.wiki.kernel.org/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable.git
@@ -1366,8 +1179,7 @@ F:	Documentation/filesystems/btrfs.txt
 F:	fs/btrfs/
 
 BTTV VIDEO4LINUX DRIVER
-P:	Mauro Carvalho Chehab
-M:	[email protected]
+M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 W:	http://linuxtv.org
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
@@ -1376,16 +1188,14 @@ F:	Documentation/video4linux/bttv/
 F:	drivers/media/video/bt8xx/bttv*
 
 CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS
-P:	David Howells
-M:	[email protected]
+M:	David Howells <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	Documentation/filesystems/caching/cachefiles.txt
 F:	fs/cachefiles/
 
 CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER
-P:	Jonathan Corbet
-M:	[email protected]
+M:	Jonathan Corbet <[email protected]>
 L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:	Maintained
@@ -1393,10 +1203,8 @@ F:	Documentation/video4linux/cafe_ccic
 F:	drivers/media/video/cafe_ccic*
 
 CALGARY x86-64 IOMMU
-P:	Muli Ben-Yehuda
-M:	[email protected]
-P:	Jon D. Mason
-M:	[email protected]
+M:	Muli Ben-Yehuda <[email protected]>
+M:	"Jon D. Mason" <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	arch/x86/kernel/pci-calgary_64.c
@@ -1405,10 +1213,8 @@ F:	arch/x86/include/asm/calgary.h
 F:	arch/x86/include/asm/tce.h
 
 CAN NETWORK LAYER
-P:	Urs Thuermann
-M:	[email protected]
-P:	Oliver Hartkopp
-M:	[email protected]
+M:	Urs Thuermann <[email protected]>
+M:	Oliver Hartkopp <[email protected]>
 L:	[email protected] (subscribers-only)
 W:	http://developer.berlios.de/projects/socketcan/
 S:	Maintained
@@ -1417,15 +1223,13 @@ F:	include/linux/can/
 F:	include/linux/can.h
 
 CAN NETWORK DRIVERS
-P:	Wolfgang Grandegger
-M:	[email protected]
+M:	Wolfgang Grandegger <[email protected]>
 L:	[email protected] (subscribers-only)
 W:	http://developer.berlios.de/projects/socketcan/
 S:	Maintained
 
 CELL BROADBAND ENGINE ARCHITECTURE
-P:	Arnd Bergmann
-M:	[email protected]
+M:	Arnd Bergmann <[email protected]>
 L:	[email protected]
 L:	[email protected]
 W:	http://www.ibm.com/developerworks/power/cell/
@@ -1436,8 +1240,7 @@ F:	arch/powerpc/oprofile/*cell*
 F:	arch/powerpc/platforms/cell/
 
 CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
-P:	David Vrabel
-M:	[email protected]
+M:	David Vrabel <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	Documentation/usb/WUSB-Design-overview.txt
@@ -1446,8 +1249,7 @@ F:	drivers/usb/wusbcore/
 F:	include/linux/usb/wusb*
 
 CFAG12864B LCD DRIVER
-P:	Miguel Ojeda Sandonis
-M:	[email protected]
+M:	Miguel Ojeda Sandonis <[email protected]>
 W:	http://miguelojeda.es/auxdisplay.htm
 W:	http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
 S:	Maintained
@@ -1455,8 +1257,7 @@ F:	drivers/auxdisplay/cfag12864b.c
 F:	include/linux/cfag12864b.h
 
 CFAG12864BFB LCD FRAMEBUFFER DRIVER
-P:	Miguel Ojeda Sandonis
-M:	[email protected]
+M:	Miguel Ojeda Sandonis <[email protected]>
 W:	http://miguelojeda.es/auxdisplay.htm
 W:	http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
 S:	Maintained
@@ -1464,8 +1265,7 @@ F:	drivers/auxdisplay/cfag12864bfb.c
 F:	include/linux/cfag12864b.h
 
 CFG80211 and NL80211
-P:	Johannes Berg
-M:	[email protected]
+M:	Johannes Berg <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	include/linux/nl80211.h
@@ -1474,57 +1274,47 @@ F:	net/wireless/*
 X:	net/wireless/wext*
 
 CHECKPATCH
-P:	Andy Whitcroft
-M:	[email protected]
+M:	Andy Whitcroft <[email protected]>
 S:	Supported
 F:	scripts/checkpatch.pl
 
 CISCO 10G ETHERNET DRIVER
-P:	Scott Feldman
-M:	[email protected]
-P:	Joe Eykholt
-M:	[email protected]
+M:	Scott Feldman <[email protected]>
+M:	Joe Eykholt <[email protected]>
 S:	Supported
 F:	drivers/net/enic/
 
 CIRRUS LOGIC EP93XX ETHERNET DRIVER
-P:	Lennert Buytenhek
-M:	[email protected]
+M:	Lennert Buytenhek <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/net/arm/ep93xx_eth.c
 
 CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER
-P:	Lennert Buytenhek
-M:	[email protected]
+M:	Lennert Buytenhek <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/usb/host/ohci-ep93xx.c
 
 CIRRUS LOGIC CS4270 SOUND DRIVER
-P:	Timur Tabi
-M:	[email protected]
+M:	Timur Tabi <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 S:	Supported
 F:	sound/soc/codecs/cs4270*
 
 CLK API
-P:	Russell King
-M:	[email protected]
+M:	Russell King <[email protected]>
 F:	include/linux/clk.h
 
 CISCO FCOE HBA DRIVER
-P:	Abhijeet Joglekar
-M:	[email protected]
-P:	Joe Eykholt
-M:	[email protected]
+M:	Abhijeet Joglekar <[email protected]>
+M:	Joe Eykholt <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	drivers/scsi/fnic/
 
 CODA FILE SYSTEM
-P:	Jan Harkes
-M:	[email protected]
+M:	Jan Harkes <[email protected]>
 M:	[email protected]
 L:	[email protected]
 W:	http://www.coda.cs.cmu.edu/
@@ -1534,8 +1324,7 @@ F:	fs/coda/
 F:	include/linux/coda*.h
 
 COMMON INTERNET FILE SYSTEM (CIFS)
-P:	Steve French
-M:	[email protected]
+M:	Steve French <[email protected]>
 L:	[email protected]
 L:	[email protected]
 W:	http://linux-cifs.samba.org/
@@ -1545,60 +1334,51 @@ F:	Documentation/filesystems/cifs.txt
 F:	fs/cifs/
 
 COMPACTPCI HOTPLUG CORE
-P:	Scott Murray
-M:	[email protected]
+M:	Scott Murray <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/pci/hotplug/cpci_hotplug*
 
 COMPACTPCI HOTPLUG ZIATECH ZT5550 DRIVER
-P:	Scott Murray
-M:	[email protected]
+M:	Scott Murray <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/pci/hotplug/cpcihp_zt5550.*
 
 COMPACTPCI HOTPLUG GENERIC DRIVER
-P:	Scott Murray
-M:	[email protected]
+M:	Scott Murray <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/pci/hotplug/cpcihp_generic.c
 
 COMPAL LAPTOP SUPPORT
-P:	Cezary Jackiewicz
-M:	[email protected]
+M:	Cezary Jackiewicz <[email protected]>
 S:	Maintained
 F:	drivers/platform/x86/compal-laptop.c
 
 COMPUTONE INTELLIPORT MULTIPORT CARD
-P:	Michael H. Warfield
-M:	[email protected]
+M:	"Michael H. Warfield" <[email protected]>
 W:	http://www.wittsend.com/computone.html
 S:	Maintained
 F:	Documentation/serial/computone.txt
 F:	drivers/char/ip2/
 
 CONEXANT ACCESSRUNNER USB DRIVER
-P:	Simon Arlott
-M:	[email protected]
+M:	Simon Arlott <[email protected]>
 L:	[email protected]
 W:	http://accessrunner.sourceforge.net/
 S:	Maintained
 F:	drivers/usb/atm/cxacru.c
 
 CONFIGFS
-P:	Joel Becker
-M:	[email protected]
+M:	Joel Becker <[email protected]>
 S:	Supported
 F:	fs/configfs/
 F:	include/linux/configfs.h
 
 CONTROL GROUPS (CGROUPS)
-P:	Paul Menage
-M:	[email protected]
-P:	Li Zefan
-M:	[email protected]
+M:	Paul Menage <[email protected]>
+M:	Li Zefan <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	include/linux/cgroup*
@@ -1606,30 +1386,26 @@ F:	kernel/cgroup*
 F:	mm/*cgroup*
 
 CORETEMP HARDWARE MONITORING DRIVER
-P:	Rudolf Marek
-M:	[email protected]
+M:	Rudolf Marek <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	Documentation/hwmon/coretemp
 F:	drivers/hwmon/coretemp.c
 
 COSA/SRP SYNC SERIAL DRIVER
-P:	Jan "Yenya" Kasprzak
-M:	[email protected]
+M:	Jan "Yenya" Kasprzak <[email protected]>
 W:	http://www.fi.muni.cz/~kas/cosa/
 S:	Maintained
 F:	drivers/net/wan/cosa*
 
 CPMAC ETHERNET DRIVER
-P:	Florian Fainelli
-M:	[email protected]
+M:	Florian Fainelli <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/net/cpmac.c
 
 CPU FREQUENCY DRIVERS
-P:	Dave Jones
-M:	[email protected]
+M:	Dave Jones <[email protected]>
 L:	[email protected]
 W:	http://www.codemonkey.org.uk/projects/cpufreq/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git
@@ -1639,15 +1415,13 @@ F:	drivers/cpufreq/
 F:	include/linux/cpufreq.h
 
 CPUID/MSR DRIVER
-P:	H. Peter Anvin
-M:	[email protected]
+M:	"H. Peter Anvin" <[email protected]>
 S:	Maintained
 F:	arch/x86/kernel/cpuid.c
 F:	arch/x86/kernel/msr.c
 
 CPUSETS
-P:	Paul Menage
-M:	[email protected]
+M:	Paul Menage <[email protected]>
 W:	http://www.bullopensource.org/cpuset/
 W:	http://oss.sgi.com/projects/cpusets/
 S:	Supported
@@ -1662,20 +1436,16 @@ F:	Documentation/filesystems/cramfs.txt
 F:	fs/cramfs/
 
 CRIS PORT
-P:	Mikael Starvik
-M:	[email protected]
-P:	Jesper Nilsson
-M:	[email protected]
+M:	Mikael Starvik <[email protected]>
+M:	Jesper Nilsson <[email protected]>
 L:	[email protected]
 W:	http://developer.axis.com
 S:	Maintained
 F:	arch/cris/
 
 CRYPTO API
-P:	Herbert Xu
-M:	[email protected]
-P:	David S. Miller
-M:	[email protected]
+M:	Herbert Xu <[email protected]>
+M:	"David S. Miller" <[email protected]>
 L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
 S:	Maintained
@@ -1686,22 +1456,18 @@ F:	drivers/crypto/
 F:	include/crypto/
 
 CRYPTOGRAPHIC RANDOM NUMBER GENERATOR
-P:	Neil Horman
-M:	[email protected]
+M:	Neil Horman <[email protected]>
 L:	[email protected]
 S:	Maintained
 
 CS5535 Audio ALSA driver
-P:	Jaya Kumar
-M:	[email protected]
+M:	Jaya Kumar <[email protected]>
 S:	Maintained
 F:	sound/pci/cs5535audio/
 
 CX18 VIDEO4LINUX DRIVER
-P:	Hans Verkuil
-M:	[email protected]
-P:	Andy Walls
-M:	[email protected]
+M:	Hans Verkuil <[email protected]>
+M:	Andy Walls <[email protected]>
 L:	[email protected]
 L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
@@ -1712,32 +1478,28 @@ F:	Documentation/video4linux/cx18.txt
 F:	drivers/media/video/cx18/
 
 CXGB3 ETHERNET DRIVER (CXGB3)
-P:	Divy Le Ray
-M:	[email protected]
+M:	Divy Le Ray <[email protected]>
 L:	[email protected]
 W:	http://www.chelsio.com
 S:	Supported
 F:	drivers/net/cxgb3/
 
 CXGB3 IWARP RNIC DRIVER (IW_CXGB3)
-P:	Steve Wise
-M:	[email protected]
+M:	Steve Wise <[email protected]>
 L:	[email protected]
 W:	http://www.openfabrics.org
 S:	Supported
 F:	drivers/infiniband/hw/cxgb3/
 
 CYBERPRO FB DRIVER
-P:	Russell King
-M:	[email protected]
+M:	Russell King <[email protected]>
 L:	[email protected]	(subscribers-only)
 W:	http://www.arm.linux.org.uk/
 S:	Maintained
 F:	drivers/video/cyber2000fb.*
 
 CYCLADES 2X SYNC CARD DRIVER
-P:	Arnaldo Carvalho de Melo
-M:	[email protected]
+M:	Arnaldo Carvalho de Melo <[email protected]>
 W:	http://oops.ghostprotocols.net:81/blog
 S:	Maintained
 F:	drivers/net/wan/cycx*
@@ -1754,8 +1516,7 @@ S:	Orphan
 F:	drivers/net/wan/pc300*
 
 DAMA SLAVE for AX.25
-P:	Joerg Reuter
-M:	[email protected]
+M:	Joerg Reuter <[email protected]>
 W:	http://yaina.de/jreuter/
 W:	http://www.qsl.net/dl1bke/
 L:	[email protected]
@@ -1769,29 +1530,23 @@ F:	net/ax25/ax25_timer.c
 F:	net/ax25/sysctl_net_ax25.c
 
 DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
-P:	Tobias Ringstrom
-M:	[email protected]
+M:	Tobias Ringstrom <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	Documentation/networking/dmfe.txt
 F:	drivers/net/tulip/dmfe.c
 
 DC390/AM53C974 SCSI driver
-P:	Kurt Garloff
-M:	[email protected]
+M:	Kurt Garloff <[email protected]>
 W:	http://www.garloff.de/kurt/linux/dc390/
-P:	Guennadi Liakhovetski
-M:	[email protected]
+M:	Guennadi Liakhovetski <[email protected]>
 S:	Maintained
 F:	drivers/scsi/tmscsim.*
 
 DC395x SCSI driver
-P:	Oliver Neukum
-M:	[email protected]
-P:	Ali Akcaagac
-M:	[email protected]
-P:	Jamie Lenehan
-M:	[email protected]
+M:	Oliver Neukum <[email protected]>
+M:	Ali Akcaagac <[email protected]>
+M:	Jamie Lenehan <[email protected]>
 W:	http://twibble.org/dist/dc395x/
 L:	[email protected]
 L:	http://lists.twibble.org/mailman/listinfo/dc395x/
@@ -1800,8 +1555,7 @@ F:	Documentation/scsi/dc395x.txt
 F:	drivers/scsi/dc395x.*
 
 DCCP PROTOCOL
-P:	Arnaldo Carvalho de Melo
-M:	[email protected]
+M:	Arnaldo Carvalho de Melo <[email protected]>
 L:	[email protected]
 W:	http://linux-net.osdl.org/index.php/DCCP
 S:	Maintained
@@ -1810,8 +1564,7 @@ F:	include/linux/tfrc.h
 F:	net/dccp/
 
 DECnet NETWORK LAYER
-P:	Christine Caulfield
-M:	[email protected]
+M:	Christine Caulfield <[email protected]>
 W:	http://linux-decnet.sourceforge.net
 L:	[email protected]
 S:	Maintained
@@ -1819,40 +1572,34 @@ F:	Documentation/networking/decnet.txt
 F:	net/decnet/
 
 DEFXX FDDI NETWORK DRIVER
-P:	Maciej W. Rozycki
-M:	[email protected]
+M:	"Maciej W. Rozycki" <[email protected]>
 S:	Maintained
 F:	drivers/net/defxx.*
 
 DELL LAPTOP DRIVER
-P:	Matthew Garrett
-M:	[email protected]
+M:	Matthew Garrett <[email protected]>
 S:	Maintained
 F:	drivers/platform/x86/dell-laptop.c
 
 DELL LAPTOP SMM DRIVER
-P:	Massimo Dal Zotto
-M:	[email protected]
+M:	Massimo Dal Zotto <[email protected]>
 W:	http://www.debian.org/~dz/i8k/
 S:	Maintained
 F:	drivers/char/i8k.c
 F:	include/linux/i8k.h
 
 DELL SYSTEMS MANAGEMENT BASE DRIVER (dcdbas)
-P:	Doug Warzecha
-M:	[email protected]
+M:	Doug Warzecha <[email protected]>
 S:	Maintained
 F:	Documentation/dcdbas.txt
 F:	drivers/firmware/dcdbas.*
 
 DELL WMI EXTRAS DRIVER
-P:	Matthew Garrett
-M:	[email protected]
+M:	Matthew Garrett <[email protected]>
 S:	Maintained
 
 DEVICE NUMBER REGISTRY
-P:	Torben Mathiasen
-M:	[email protected]
+M:	Torben Mathiasen <[email protected]>
 W:	http://lanana.org/docs/device-list/index.html
 S:	Maintained
 
@@ -1867,8 +1614,7 @@ F:	include/linux/device-mapper.h
 F:	include/linux/dm-*.h
 
 DIGI INTL. EPCA DRIVER
-P:	Digi International, Inc
-M:	[email protected]
+M:	"Digi International, Inc" <[email protected]>
 L:	[email protected]
 W:	http://www.digi.com
 S:	Orphan
@@ -1877,34 +1623,29 @@ F:	drivers/char/epca*
 F:	drivers/char/digi*
 
 DIRECTORY NOTIFICATION (DNOTIFY)
-P:	Eric Paris
-M:	[email protected]
+M:	Eric Paris <[email protected]>
 S:	Maintained
 F:	Documentation/filesystems/dnotify.txt
 F:	fs/notify/dnotify/
 F:	include/linux/dnotify.h
 
 DISK GEOMETRY AND PARTITION HANDLING
-P:	Andries Brouwer
-M:	[email protected]
+M:	Andries Brouwer <[email protected]>
 W:	http://www.win.tue.nl/~aeb/linux/Large-Disk.html
 W:	http://www.win.tue.nl/~aeb/linux/zip/zip-1.html
 W:	http://www.win.tue.nl/~aeb/partitions/partition_types-1.html
 S:	Maintained
 
 DISKQUOTA
-P:	Jan Kara
-M:	[email protected]
+M:	Jan Kara <[email protected]>
 S:	Maintained
 F:	Documentation/filesystems/quota.txt
 F:	fs/quota/
 F:	include/linux/quota*.h
 
 DISTRIBUTED LOCK MANAGER (DLM)
-P:	Christine Caulfield
-M:	[email protected]
-P:	David Teigland
-M:	[email protected]
+M:	Christine Caulfield <[email protected]>
+M:	David Teigland <[email protected]>
 L:	[email protected]
 W:	http://sources.redhat.com/cluster/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git
@@ -1912,52 +1653,44 @@ S:	Supported
 F:	fs/dlm/
 
 DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
-P:	Maciej Sosnowski
-M:	[email protected]
-P:	Dan Williams
-M:	[email protected]
+M:	Maciej Sosnowski <[email protected]>
+M:	Dan Williams <[email protected]>
 S:	Supported
 F:	drivers/dma/
 F:	include/linux/dma*
 
 DME1737 HARDWARE MONITOR DRIVER
-P:	Juerg Haefliger
-M:	[email protected]
+M:	Juerg Haefliger <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	Documentation/hwmon/dme1737
 F:	drivers/hwmon/dme1737.c
 
 DOCBOOK FOR DOCUMENTATION
-P:	Randy Dunlap
-M:	[email protected]
+M:	Randy Dunlap <[email protected]>
 S:	Maintained
 
 DOCKING STATION DRIVER
-P:	Shaohua Li
-M:	[email protected]
+M:	Shaohua Li <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	drivers/acpi/dock.c
 
 DOCUMENTATION
-P:	Randy Dunlap
-M:	[email protected]
+M:	Randy Dunlap <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	Documentation/
 
 DOUBLETALK DRIVER
-P:	James R. Van Zandt
-M:	[email protected]
+M:	"James R. Van Zandt" <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/char/dtlk.c
 F:	include/linux/dtlk.h
 
 DPT_I2O SCSI RAID DRIVER
-P:	Adaptec OEM Raid Solutions
-M:	[email protected]
+M:	Adaptec OEM Raid Solutions <[email protected]>
 L:	[email protected]
 W:	http://www.adaptec.com/
 S:	Maintained
@@ -1965,8 +1698,7 @@ F:	drivers/scsi/dpt*
 F:	drivers/scsi/dpt/
 
 DRIVER CORE, KOBJECTS, AND SYSFS
-P:	Greg Kroah-Hartman
-M:	[email protected]
+M:	Greg Kroah-Hartman <[email protected]>
 T:	quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 S:	Supported
 F:	Documentation/kobject.txt
@@ -1976,52 +1708,45 @@ F:	include/linux/kobj*
 F:	lib/kobj*
 
 DRM DRIVERS
-P:	David Airlie
-M:	[email protected]
+M:	David Airlie <[email protected]>
 L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git
 S:	Maintained
 F:	drivers/gpu/drm/
 
 DSCC4 DRIVER
-P:	Francois Romieu
-M:	[email protected]
+M:	Francois Romieu <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/net/wan/dscc4.c
 
 DZ DECSTATION DZ11 SERIAL DRIVER
-P:	Maciej W. Rozycki
-M:	[email protected]
+M:	"Maciej W. Rozycki" <[email protected]>
 S:	Maintained
 F:	drivers/serial/dz.*
 
 EATA-DMA SCSI DRIVER
-P:	Michael Neuffer
-M:	[email protected]
+M:	Michael Neuffer <[email protected]>
 L:	[email protected]
 L:	[email protected]
 S:	Maintained
 F:	drivers/scsi/eata*
 
 EATA ISA/EISA/PCI SCSI DRIVER
-P:	Dario Ballabio
-M:	[email protected]
+M:	Dario Ballabio <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/scsi/eata.c
 
 EATA-PIO SCSI DRIVER
-P:	Michael Neuffer
-M:	[email protected]
+M:	Michael Neuffer <[email protected]>
 L:	[email protected]
 L:	[email protected]
 S:	Maintained
 F:	drivers/scsi/eata_pio.*
 
 EBTABLES
-P:	Bart De Schuymer
-M:	[email protected]
+M:	Bart De Schuymer <[email protected]>
 L:	[email protected]
 L:	[email protected]
 W:	http://ebtables.sourceforge.net/
@@ -2030,10 +1755,8 @@ F:	include/linux/netfilter_bridge/ebt_*.h
 F:	net/bridge/netfilter/ebt*.c
 
 ECRYPT FILE SYSTEM
-P:	Tyler Hicks
-M:	[email protected]
-P:	Dustin Kirkland
-M:	[email protected]
+M:	Tyler Hicks <[email protected]>
+M:	Dustin Kirkland <[email protected]>
 L:	[email protected]
 W:	https://launchpad.net/ecryptfs
 S:	Supported
@@ -2041,8 +1764,7 @@ F:	Documentation/filesystems/ecryptfs.txt
 F:	fs/ecryptfs/
 
 EDAC-CORE
-P:	Doug Thompson
-M:	[email protected]
+M:	Doug Thompson <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 W:	bluesmoke.sourceforge.net
 S:	Supported
@@ -2051,94 +1773,80 @@ F:	drivers/edac/edac_*
 F:	include/linux/edac.h
 
 EDAC-AMD64
-P:	Doug Thompson
-M:	[email protected]
-P:	Borislav Petkov
-M:	[email protected]
+M:	Doug Thompson <[email protected]>
+M:	Borislav Petkov <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 W:	bluesmoke.sourceforge.net
 S:	Supported
 F:	drivers/edac/amd64_edac*
 
 EDAC-E752X
-P:	Mark Gross
-M:	[email protected]
-P:	Doug Thompson
-M:	[email protected]
+M:	Mark Gross <[email protected]>
+M:	Doug Thompson <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 W:	bluesmoke.sourceforge.net
 S:	Maintained
 F:	drivers/edac/e752x_edac.c
 
 EDAC-E7XXX
-P:	Doug Thompson
-M:	[email protected]
+M:	Doug Thompson <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 W:	bluesmoke.sourceforge.net
 S:	Maintained
 F:	drivers/edac/e7xxx_edac.c
 
 EDAC-I82443BXGX
-P:	Tim Small
-M:	[email protected]
+M:	Tim Small <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 W:	bluesmoke.sourceforge.net
 S:	Maintained
 F:	drivers/edac/i82443bxgx_edac.c
 
 EDAC-I3000
-P:	Jason Uhlenkott
-M:	[email protected]
+M:	Jason Uhlenkott <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 W:	bluesmoke.sourceforge.net
 S:	Maintained
 F:	drivers/edac/i3000_edac.c
 
 EDAC-I5000
-P:	Doug Thompson
-M:	[email protected]
+M:	Doug Thompson <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 W:	bluesmoke.sourceforge.net
 S:	Maintained
 F:	drivers/edac/i5000_edac.c
 
 EDAC-I5400
-P:	Mauro Carvalho Chehab
-M:	[email protected]
+M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 W:	bluesmoke.sourceforge.net
 S:	Maintained
 F:	drivers/edac/i5400_edac.c
 
 EDAC-I82975X
-P:	Ranganathan Desikan
-M:	[email protected]
-P:	Arvind R.
-M:	[email protected]
+M:	Ranganathan Desikan <[email protected]>
+M:	"Arvind R." <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 W:	bluesmoke.sourceforge.net
 S:	Maintained
 F:	drivers/edac/i82975x_edac.c
 
 EDAC-PASEMI
-P:	Egor Martovetsky
-M:	[email protected]
+M:	Egor Martovetsky <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 W:	bluesmoke.sourceforge.net
 S:	Maintained
 F:	drivers/edac/pasemi_edac.c
 
 EDAC-R82600
-P:	Tim Small
-M:	[email protected]
+M:	Tim Small <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 W:	bluesmoke.sourceforge.net
 S:	Maintained
 F:	drivers/edac/r82600_edac.c
 
 EEEPC LAPTOP EXTRAS DRIVER
-P:	Corentin Chary
-M:	[email protected]
+M:	Corentin Chary <[email protected]>
 L:	[email protected]
 W:	http://acpi4asus.sf.net
 S:	Maintained
@@ -2150,65 +1858,53 @@ S:	Orphan
 F:	fs/efs/
 
 EHCA (IBM GX bus InfiniBand adapter) DRIVER
-P:	Hoang-Nam Nguyen
-M:	[email protected]
-P:	Christoph Raisch
-M:	[email protected]
+M:	Hoang-Nam Nguyen <[email protected]>
+M:	Christoph Raisch <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	drivers/infiniband/hw/ehca/
 
 EMBEDDED LINUX
-P:	Paul Gortmaker
-M:	[email protected]
-P:	Matt Mackall
-M:	[email protected]
-P:	David Woodhouse
-M:	[email protected]
+M:	Paul Gortmaker <[email protected]>
+M:	Matt Mackall <[email protected]>
+M:	David Woodhouse <[email protected]>
 L:	[email protected]
 S:	Maintained
 
 EMULEX LPFC FC SCSI DRIVER
-P:	James Smart
-M:	[email protected]
+M:	James Smart <[email protected]>
 L:	[email protected]
 W:	http://sourceforge.net/projects/lpfcxxxx
 S:	Supported
 F:	drivers/scsi/lpfc/
 
 ENE CB710 FLASH CARD READER DRIVER
-P:	Michał Mirosław
-M:	[email protected]
+M:	Michał Mirosław <[email protected]>
 S:	Maintained
 F:	drivers/misc/cb710/
 F:	drivers/mmc/host/cb710-mmc.*
 F:	include/linux/cb710.h
 
 EPSON 1355 FRAMEBUFFER DRIVER
-P:	Christopher Hoover
-M:	[email protected]
-P:	Christopher Hoover
-M:	[email protected]
+M:	Christopher Hoover <[email protected]>
+M:	Christopher Hoover <[email protected]>
 S:	Maintained
 F:	drivers/video/epson1355fb.c
 
 EPSON S1D13XXX FRAMEBUFFER DRIVER
-P:	Kristoffer Ericson
-M:	[email protected]
+M:	Kristoffer Ericson <[email protected]>
 S:	Maintained
 F:	drivers/video/s1d13xxxfb.c
 F:	include/video/s1d13xxxfb.h
 
 ETHEREXPRESS-16 NETWORK DRIVER
-P:	Philip Blundell
-M:	[email protected]
+M:	Philip Blundell <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/net/eexpress.*
 
 ETHERNET BRIDGE
-P:	Stephen Hemminger
-M:	[email protected]
+M:	Stephen Hemminger <[email protected]>
 L:	[email protected]
 W:	http://www.linux-foundation.org/en/Net:Bridge
 S:	Maintained
@@ -2216,8 +1912,7 @@ F:	include/linux/netfilter_bridge/
 F:	net/bridge/
 
 ETHERTEAM 16I DRIVER
-P:	Mika Kuoppala
-M:	[email protected]
+M:	Mika Kuoppala <[email protected]>
 S:	Maintained
 F:	drivers/net/eth16i.c
 
@@ -2229,12 +1924,9 @@ F:	fs/ext2/
 F:	include/linux/ext2*
 
 EXT3 FILE SYSTEM
-P:	Stephen Tweedie
-M:	[email protected]
-P:	Andrew Morton
-M:	[email protected]
-P:	Andreas Dilger
-M:	[email protected]
+M:	Stephen Tweedie <[email protected]>
+M:	Andrew Morton <[email protected]>
+M:	Andreas Dilger <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	Documentation/filesystems/ext3.txt
@@ -2242,10 +1934,8 @@ F:	fs/ext3/
 F:	include/linux/ext3*
 
 EXT4 FILE SYSTEM
-P:	Theodore Ts'o
-M:	[email protected]
-P:	Andreas Dilger
-M:	[email protected]
+M:	"Theodore Ts'o" <[email protected]>
+M:	Andreas Dilger <[email protected]>
 L:	[email protected]
 W:	http://ext4.wiki.kernel.org
 S:	Maintained
@@ -2253,30 +1943,26 @@ F:	Documentation/filesystems/ext4.txt
 F:	fs/ext4/
 
 F71805F HARDWARE MONITORING DRIVER
-P:	Jean Delvare
-M:	[email protected]
+M:	Jean Delvare <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	Documentation/hwmon/f71805f
 F:	drivers/hwmon/f71805f.c
 
 FARSYNC SYNCHRONOUS DRIVER
-P:	Kevin Curtis
-M:	[email protected]
+M:	Kevin Curtis <[email protected]>
 W:	http://www.farsite.co.uk/
 S:	Supported
 F:	drivers/net/wan/farsync.*
 
 FAULT INJECTION SUPPORT
-P:	Akinobu Mita
-M:	[email protected]
+M:	Akinobu Mita <[email protected]>
 S:	Supported
 F:	Documentation/fault-injection/
 F:	lib/fault-inject.c
 
 FILE LOCKING (flock() and fcntl()/lockf())
-P:	Matthew Wilcox
-M:	[email protected]
+M:	Matthew Wilcox <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	include/linux/fcntl.h
@@ -2285,25 +1971,21 @@ F:	fs/fcntl.c
 F:	fs/locks.c
 
 FILESYSTEMS (VFS and infrastructure)
-P:	Alexander Viro
-M:	[email protected]
+M:	Alexander Viro <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	fs/*
 
 FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
-P:	Riku Voipio
-M:	[email protected]
+M:	Riku Voipio <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/hwmon/f75375s.c
 F:	include/linux/f75375s.h
 
 FIREWIRE SUBSYSTEM
-P:	Kristian Hoegsberg
-M:	[email protected]
-P:	Stefan Richter
-M:	[email protected]
+M:	Kristian Hoegsberg <[email protected]>
+M:	Stefan Richter <[email protected]>
 L:	[email protected]
 W:	http://www.linux1394.org/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
@@ -2318,15 +2000,13 @@ F:	drivers/base/firmware*.c
 F:	include/linux/firmware.h
 
 FPU EMULATOR
-P:	Bill Metzenthen
-M:	[email protected]
+M:	Bill Metzenthen <[email protected]>
 W:	http://floatingpoint.sourceforge.net/emulator/index.html
 S:	Maintained
 F:	arch/x86/math-emu/
 
 FRAME RELAY DLCI/FRAD (Sangoma drivers too)
-P:	Mike McLagan
-M:	[email protected]
+M:	Mike McLagan <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/net/wan/dlci.c
@@ -2341,25 +2021,21 @@ F:	drivers/video/fb*
 F:	include/linux/fb.h
 
 FREESCALE DMA DRIVER
-P:	Li Yang
-M:	[email protected]
-P:	Zhang Wei
-M:	[email protected]
+M:	Li Yang <[email protected]>
+M:	Zhang Wei <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/dma/fsldma.*
 
 FREESCALE I2C CPM DRIVER
-P:	Jochen Friedrich
-M:	[email protected]
+M:	Jochen Friedrich <[email protected]>
 L:	[email protected]
 L:	[email protected]
 S:	Maintained
 F:	drivers/i2c/busses/i2c-cpm.c
 
 FREESCALE IMX / MXC FRAMEBUFFER DRIVER
-P:	Sascha Hauer
-M:	[email protected]
+M:	Sascha Hauer <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 L:	[email protected] (subscribers-only)
 S:	Maintained
@@ -2367,10 +2043,8 @@ F:	arch/arm/plat-mxc/include/mach/imxfb.h
 F:	drivers/video/imxfb.c
 
 FREESCALE SOC FS_ENET DRIVER
-P:	Pantelis Antoniou
-M:	[email protected]
-P:	Vitaly Bordug
-M:	[email protected]
+M:	Pantelis Antoniou <[email protected]>
+M:	Vitaly Bordug <[email protected]>
 L:	[email protected]
 L:	[email protected]
 S:	Maintained
@@ -2378,39 +2052,34 @@ F:	drivers/net/fs_enet/
 F:	include/linux/fs_enet_pd.h
 
 FREESCALE QUICC ENGINE LIBRARY
-P:	Timur Tabi
-M:	[email protected]
+M:	Timur Tabi <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	arch/powerpc/sysdev/qe_lib/
 F:	arch/powerpc/include/asm/*qe.h
 
 FREESCALE HIGHSPEED USB DEVICE DRIVER
-P:	Li Yang
-M:	[email protected]
+M:	Li Yang <[email protected]>
 L:	[email protected]
 L:	[email protected]
 S:	Maintained
 F:	drivers/usb/gadget/fsl_usb2_udc.c
 
 FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
-P:	Li Yang
-M:	[email protected]
+M:	Li Yang <[email protected]>
 L:	[email protected]
 L:	[email protected]
 S:	Maintained
 F:	drivers/net/ucc_geth*
 
 FREESCALE QUICC ENGINE UCC UART DRIVER
-P:	Timur Tabi
-M:	[email protected]
+M:	Timur Tabi <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	drivers/serial/ucc_uart.c
 
 FREESCALE SOC SOUND DRIVERS
-P:	Timur Tabi
-M:	[email protected]
+M:	Timur Tabi <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 L:	[email protected]
 S:	Supported
@@ -2418,17 +2087,14 @@ F:	sound/soc/fsl/fsl*
 F:	sound/soc/fsl/mpc8610_hpcd.c
 
 FREEVXFS FILESYSTEM
-P:	Christoph Hellwig
-M:	[email protected]
+M:	Christoph Hellwig <[email protected]>
 W:	ftp://ftp.openlinux.org/pub/people/hch/vxfs
 S:	Maintained
 F:	fs/freevxfs/
 
 FREEZER
-P:	Pavel Machek
-M:	[email protected]
-P:	Rafael J. Wysocki
-M:	[email protected]
+M:	Pavel Machek <[email protected]>
+M:	"Rafael J. Wysocki" <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	Documentation/power/freezing-of-tasks.txt
@@ -2436,8 +2102,7 @@ F:	include/linux/freezer.h
 F:	kernel/freezer.c
 
 FS-CACHE: LOCAL CACHING FOR NETWORK FILESYSTEMS
-P:	David Howells
-M:	[email protected]
+M:	David Howells <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	Documentation/filesystems/caching/
@@ -2445,8 +2110,7 @@ F:	fs/fscache/
 F:	include/linux/fscache*.h
 
 FTRACE
-P:	Steven Rostedt
-M:	[email protected]
+M:	Steven Rostedt <[email protected]>
 S:	Maintained
 F:	Documentation/trace/ftrace.txt
 F:	arch/*/*/*/ftrace.h
@@ -2455,21 +2119,18 @@ F:	include/*/ftrace.h
 F:	kernel/trace/
 
 FUJITSU FR-V (FRV) PORT
-P:	David Howells
-M:	[email protected]
+M:	David Howells <[email protected]>
 S:	Maintained
 F:	arch/frv/
 
 FUJITSU LAPTOP EXTRAS
-P:	Jonathan Woithe
-M:	[email protected]
+M:	Jonathan Woithe <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/platform/x86/fujitsu-laptop.c
 
 FUSE: FILESYSTEM IN USERSPACE
-P:	Miklos Szeredi
-M:	[email protected]
+M:	Miklos Szeredi <[email protected]>
 L:	[email protected]
 W:	http://fuse.sourceforge.net/
 S:	Maintained
@@ -2477,30 +2138,26 @@ F:	fs/fuse/
 F:	include/linux/fuse.h
 
 FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)
-P:	Rik Faith
-M:	[email protected]
+M:	Rik Faith <[email protected]>
 L:	[email protected]
 S:	Odd Fixes (e.g., new signatures)
 F:	drivers/scsi/fdomain.*
 
 GDT SCSI DISK ARRAY CONTROLLER DRIVER
-P:	Achim Leubner
-M:	[email protected]
+M:	Achim Leubner <[email protected]>
 L:	[email protected]
 W:	http://www.icp-vortex.com/
 S:	Supported
 F:	drivers/scsi/gdt*
 
 GENERIC GPIO I2C DRIVER
-P:	Haavard Skinnemoen
-M:	[email protected]
+M:	Haavard Skinnemoen <[email protected]>
 S:	Supported
 F:	drivers/i2c/busses/i2c-gpio.c
 F:	include/linux/i2c-gpio.h
 
 GENERIC HDLC (WAN) DRIVERS
-P:	Krzysztof Halasa
-M:	[email protected]
+M:	Krzysztof Halasa <[email protected]>
 W:	http://www.kernel.org/pub/linux/utils/net/hdlc/
 S:	Maintained
 F:	drivers/net/wan/c101.c
@@ -2512,16 +2169,14 @@ F:	drivers/net/wan/pci200syn.c
 F:	drivers/net/wan/wanxl*
 
 GENERIC INCLUDE/ASM HEADER FILES
-P:	Arnd Bergmann
-M:	[email protected]
+M:	Arnd Bergmann <[email protected]>
 L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git
 S:	Maintained
 F:	include/asm-generic
 
 GFS2 FILE SYSTEM
-P:	Steven Whitehouse
-M:	[email protected]
+M:	Steven Whitehouse <[email protected]>
 L:	[email protected]
 W:	http://sources.redhat.com/cluster/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes.git
@@ -2532,10 +2187,8 @@ F:	fs/gfs2/
 F:	include/linux/gfs2_ondisk.h
 
 GIGASET ISDN DRIVERS
-P:	Hansjoerg Lipp
-M:	[email protected]
-P:	Tilman Schmidt
-M:	[email protected]
+M:	Hansjoerg Lipp <[email protected]>
+M:	Tilman Schmidt <[email protected]>
 L:	[email protected]
 W:	http://gigaset307x.sourceforge.net/
 S:	Maintained
@@ -2544,8 +2197,7 @@ F:	drivers/isdn/gigaset/
 F:	include/linux/gigaset_dev.h
 
 HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
-P:	Frank Seidel
-M:	[email protected]
+M:	Frank Seidel <[email protected]>
 L:	[email protected]
 W:	http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
 S:	Maintained
@@ -2557,40 +2209,35 @@ S:	Odd Fixes
 F:	drivers/char/hvc_*
 
 GSPCA FINEPIX SUBDRIVER
-P:	Frank Zago
-M:	[email protected]
+M:	Frank Zago <[email protected]>
 L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:	Maintained
 F:	drivers/media/video/gspca/finepix.c
 
 GSPCA M5602 SUBDRIVER
-P:	Erik Andren
-M:	[email protected]
+M:	Erik Andren <[email protected]>
 L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:	Maintained
 F:	drivers/media/video/gspca/m5602/
 
 GSPCA PAC207 SONIXB SUBDRIVER
-P:	Hans de Goede
-M:	[email protected]
+M:	Hans de Goede <[email protected]>
 L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:	Maintained
 F:	drivers/media/video/gspca/pac207.c
 
 GSPCA T613 SUBDRIVER
-P:	Leandro Costantino
-M:	[email protected]
+M:	Leandro Costantino <[email protected]>
 L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:	Maintained
 F:	drivers/media/video/gspca/t613.c
 
 GSPCA USB WEBCAM DRIVER
-P:	Jean-Francois Moine
-M:	[email protected]
+M:	Jean-Francois Moine <[email protected]>
 W:	http://moinejf.free.fr
 L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
@@ -2610,31 +2257,27 @@ F:	drivers/char/hw_random/
 F:	include/linux/hw_random.h
 
 HARMONY SOUND DRIVER
-P:	Kyle McMartin
-M:	[email protected]
+M:	Kyle McMartin <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	sound/parisc/harmony.*
 
 HAYES ESP SERIAL DRIVER
-P:	Andrew J. Robinson
-M:	[email protected]
+M:	"Andrew J. Robinson" <[email protected]>
 W:	http://www.nyx.net/~arobinso
 S:	Maintained
 F:	Documentation/serial/hayes-esp.txt
 F:	drivers/char/esp.c
 
 HEWLETT-PACKARD SMART2 RAID DRIVER
-P:	Chirag Kantharia
-M:	[email protected]
+M:	Chirag Kantharia <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	Documentation/blockdev/cpqarray.txt
 F:	drivers/block/cpqarray.*
 
 HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)
-P:	Mike Miller
-M:	[email protected]
+M:	Mike Miller <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	Documentation/blockdev/cciss.txt
@@ -2642,25 +2285,21 @@ F:	drivers/block/cciss*
 F:	include/linux/cciss_ioctl.h
 
 HFS FILESYSTEM
-P:	Roman Zippel
-M:	[email protected]
+M:	Roman Zippel <[email protected]>
 S:	Maintained
 F:	Documentation/filesystems/hfs.txt
 F:	fs/hfs/
 
 HGA FRAMEBUFFER DRIVER
-P:	Ferenc Bakonyi
-M:	[email protected]
+M:	Ferenc Bakonyi <[email protected]>
 L:	[email protected]
 W:	http://drama.obuda.kando.hu/~fero/cgi-bin/hgafb.shtml
 S:	Maintained
 F:	drivers/video/hgafb.c
 
 HIBERNATION (aka Software Suspend, aka swsusp)
-P:	Pavel Machek
-M:	[email protected]
-P:	Rafael J. Wysocki
-M:	[email protected]
+M:	Pavel Machek <[email protected]>
+M:	"Rafael J. Wysocki" <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	arch/x86/power/
@@ -2672,8 +2311,7 @@ F:	include/linux/pm.h
 F:	arch/*/include/asm/suspend*.h
 
 HID CORE LAYER
-P:	Jiri Kosina
-M:	[email protected]
+M:	Jiri Kosina <[email protected]>
 L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
 S:	Maintained
@@ -2681,16 +2319,14 @@ F:	drivers/hid/
 F:	include/linux/hid*
 
 HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS
-P:	Thomas Gleixner
-M:	[email protected]
+M:	Thomas Gleixner <[email protected]>
 S:	Maintained
 F:	Documentation/timers/
 F:	kernel/hrtimer.c
 F:	include/linux/hrtimer.h
 
 HIGH-SPEED SCC DRIVER FOR AX.25
-P:	Klaus Kudielka
-M:	[email protected]
+M:	Klaus Kudielka <[email protected]>
 L:	[email protected]
 W:	http://www.nt.tuwien.ac.at/~kkudielk/Linux/
 S:	Maintained
@@ -2698,16 +2334,14 @@ F:	drivers/net/hamradio/dmascc.c
 F:	drivers/net/hamradio/scc.c
 
 HIGHPOINT ROCKETRAID 3xxx RAID DRIVER
-P:	HighPoint Linux Team
-M:	[email protected]
+M:	HighPoint Linux Team <[email protected]>
 W:	http://www.highpoint-tech.com
 S:	Supported
 F:	Documentation/scsi/hptiop.txt
 F:	drivers/scsi/hptiop.c
 
 HIPPI
-P:	Jes Sorensen
-M:	[email protected]
+M:	Jes Sorensen <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	include/linux/hippidevice.h
@@ -2715,8 +2349,7 @@ F:	include/linux/if_hippi.h
 F:	net/802/hippi.c
 
 HOST AP DRIVER
-P:	Jouni Malinen
-M:	[email protected]
+M:	Jouni Malinen <[email protected]>
 L:	[email protected] (subscribers-only)
 L:	[email protected]
 W:	http://hostap.epitest.fi/
@@ -2724,82 +2357,69 @@ S:	Maintained
 F:	drivers/net/wireless/hostap/
 
 HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
-P:	Carlos Corbacho
-M:	[email protected]
+M:	Carlos Corbacho <[email protected]>
 S:	Odd Fixes
 F:	drivers/platform/x86/tc1100-wmi.c
 
 HP100:	Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series
-P:	Jaroslav Kysela
-M:	[email protected]
+M:	Jaroslav Kysela <[email protected]>
 S:	Maintained
 F:	drivers/net/hp100.*
 
 HPET:	High Precision Event Timers driver
-P:	Clemens Ladisch
-M:	[email protected]
+M:	Clemens Ladisch <[email protected]>
 S:	Maintained
 F:	Documentation/timers/hpet.txt
 F:	drivers/char/hpet.c
 F:	include/linux/hpet.h
 
 HPET:	i386
-P:	Venkatesh Pallipadi (Venki)
-M:	[email protected]
+M:	"Venkatesh Pallipadi (Venki)" <[email protected]>
 S:	Maintained
 F:	arch/x86/kernel/hpet.c
 F:	arch/x86/include/asm/hpet.h
 
 HPET:	x86_64
-P:	Vojtech Pavlik
-M:	[email protected]
+M:	Vojtech Pavlik <[email protected]>
 S:	Maintained
 
 HPET:	ACPI
-P:	Bob Picco
-M:	[email protected]
+M:	Bob Picco <[email protected]>
 S:	Maintained
 F:	drivers/char/hpet.c
 
 HPFS FILESYSTEM
-P:	Mikulas Patocka
-M:	[email protected]
+M:	Mikulas Patocka <[email protected]>
 W:	http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/hpfs/index-e.cgi
 S:	Maintained
 F:	fs/hpfs/
 
 HSO 3G MODEM DRIVER
-P:	Jan Dumon
-M:	[email protected]
+M:	Jan Dumon <[email protected]>
 W:	http://www.pharscape.org
 S:	Maintained
 F:	drivers/net/usb/hso.c
 
 HTCPEN TOUCHSCREEN DRIVER
-P:	Pau Oliva Fora
-M:	[email protected]
+M:	Pau Oliva Fora <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/input/touchscreen/htcpen.c
 
 HUGETLB FILESYSTEM
-P:	William Irwin
-M:	[email protected]
+M:	William Irwin <[email protected]>
 S:	Maintained
 F:	fs/hugetlbfs/
 
 I2C/SMBUS STUB DRIVER
-P:	Mark M. Hoffman
-M:	[email protected]
+M:	"Mark M. Hoffman" <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/i2c/busses/i2c-stub.c
 
 I2C SUBSYSTEM
-P:	Jean Delvare (PC drivers, core)
-M:	[email protected]
-P:	Ben Dooks (embedded platforms)
-M:	[email protected]
+M:	"Jean Delvare (PC drivers, core)" <[email protected]>
+M:	"Ben Dooks (embedded platforms)" <[email protected]>
 L:	[email protected]
 W:	http://i2c.wiki.kernel.org/
 T:	quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
@@ -2811,30 +2431,25 @@ F:	include/linux/i2c-dev.h
 F:	include/linux/i2c-id.h
 
 I2C-TINY-USB DRIVER
-P:	Till Harbaum
-M:	[email protected]
+M:	Till Harbaum <[email protected]>
 L:	[email protected]
 W:	http://www.harbaum.org/till/i2c_tiny_usb
 S:	Maintained
 F:	drivers/i2c/busses/i2c-tiny-usb.c
 
 i386 BOOT CODE
-P:	H. Peter Anvin
-M:	[email protected]
+M:	"H. Peter Anvin" <[email protected]>
 S:	Maintained
 F:	arch/x86/boot/
 
 i386 SETUP CODE / CPU ERRATA WORKAROUNDS
-P:	H. Peter Anvin
-M:	[email protected]
+M:	"H. Peter Anvin" <[email protected]>
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup.git
 S:	Maintained
 
 IA64 (Itanium) PLATFORM
-P:	Tony Luck
-M:	[email protected]
-P:	Fenghua Yu
-M:	[email protected]
+M:	Tony Luck <[email protected]>
+M:	Fenghua Yu <[email protected]>
 L:	[email protected]
 W:	http://www.ia64-linux.org/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
@@ -2842,29 +2457,25 @@ S:	Maintained
 F:	arch/ia64/
 
 IBM MCA SCSI SUBSYSTEM DRIVER
-P:	Michael Lang
-M:	[email protected]
+M:	Michael Lang <[email protected]>
 W:	http://www.uni-mainz.de/~langm000/linux.html
 S:	Maintained
 F:	drivers/scsi/ibmmca.c
 
 IBM Power Linux RAID adapter
-P:	Brian King
-M:	[email protected]
+M:	Brian King <[email protected]>
 S:	Supported
 F:	drivers/scsi/ipr.*
 
 IBM ServeRAID RAID DRIVER
 P:	Jack Hammer
-P:	Dave Jeffery
-M:	[email protected]
+M:	Dave Jeffery <[email protected]>
 W:	http://www.developer.ibm.com/welcome/netfinity/serveraid.html
 S:	Supported
 F:	drivers/scsi/ips.*
 
 IDE SUBSYSTEM
-P:	David S. Miller
-M:	[email protected]
+M:	"David S. Miller" <[email protected]>
 L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git
 S:	Maintained
@@ -2873,25 +2484,21 @@ F:	drivers/ide/
 F:	include/linux/ide.h
 
 IDE/ATAPI DRIVERS
-P:	Borislav Petkov
-M:	[email protected]
+M:	Borislav Petkov <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	Documentation/cdrom/ide-cd
 F:	drivers/ide/ide-cd*
 
 IDLE-I7300
-P:	Andy Henroid
-M:	[email protected]
+M:	Andy Henroid <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	drivers/idle/i7300_idle.c
 
 IEEE 1394 SUBSYSTEM
-P:	Ben Collins
-M:	[email protected]
-P:	Stefan Richter
-M:	[email protected]
+M:	Ben Collins <[email protected]>
+M:	Stefan Richter <[email protected]>
 L:	[email protected]
 W:	http://www.linux1394.org/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
@@ -2899,19 +2506,15 @@ S:	Maintained
 F:	drivers/ieee1394/
 
 IEEE 1394 RAW I/O DRIVER
-P:	Dan Dennedy
-M:	[email protected]
-P:	Stefan Richter
-M:	[email protected]
+M:	Dan Dennedy <[email protected]>
+M:	Stefan Richter <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/ieee1394/raw1394*
 
 IEEE 802.15.4 SUBSYSTEM
-P:	Dmitry Eremin-Solenikov
-M:	[email protected]
-P:	Sergey Lapin
-M:	[email protected]
+M:	Dmitry Eremin-Solenikov <[email protected]>
+M:	Sergey Lapin <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 W:	http://apps.sourceforge.net/trac/linux-zigbee
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git
@@ -2920,8 +2523,7 @@ F:	net/ieee802154/
 F:	drivers/ieee802154/
 
 INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
-P:	Mimi Zohar
-M:	[email protected]
+M:	Mimi Zohar <[email protected]>
 S:	Supported
 F:	security/integrity/ima/
 

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.

Acked-by on v1 1/1
#18 lore raw

Re: [PATCH] MAINTAINERS: Coalesce name and email address lines

Quoted 6 lines · On Mon, 13 Jul 2009 14:58:19 -0700 Joe Perches wrote:
Quoted 1 line · Joe Perches

A collection of cleanup patches to MAINTAINERS

I ran the script I submitted awhile back on MAINTAINERS after these [0/16] patches are applied.

Quoted 6 lines

http://lkml.org/lkml/2009/6/1/275

I think the result is useful for people that rely
on copy and paste of email addresses.

Thanks, Joe.

Quoted 8 lines
 MAINTAINERS | 2722 ++++++++++++++++++++---------------------------------------
 1 files changed, 908 insertions(+), 1814 deletions(-)
MAINTAINERS +0 -0
index 5befb1c..f64b085 100644

MAINTAINERS Note: For the hard of thinking, this list is meant to remain in alphabetical · line 80

Quoted 10 lines
MAINTAINERS +2 -2
@@ -73,8 +73,8 @@ Note: For the hard of thinking, this list is meant to remain in alphabetical
 order. If you could add yourselves to it in alphabetical order that would be
 so much easier [Ed]
 
-P: Person
-M: Mail patches to
+P: Person (obsolete)
+M: Mail patches to: FullName <address@domain>
 L: Mailing list that is relevant to this area
 W: Web-page with status/info
 T: SCM tree type and location.  Type is one of: git, hg, quilt, stgit.

---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/

#19 lore raw

Re: [PATCH] MAINTAINERS: Coalesce name and email address lines

In reply to Joe Perches
Quoted 10 lines · Joe Perches
Quoted 1 line · Joe Perches

A collection of cleanup patches to MAINTAINERS

I ran the script I submitted awhile back on MAINTAINERS after these [0/16] patches are applied.

http://lkml.org/lkml/2009/6/1/275

I think the result is useful for people that rely
on copy and paste of email addresses.

ACK... and thanks!

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#20 lore raw

Re: [PATCH] MAINTAINERS: Coalesce name and email address lines

In reply to Joe Perches
Quoted 8 lines · On Mon, 13 Jul 2009 14:58:19 -0700 Joe Perches <[email protected]> wrote:
Quoted 1 line · Joe Perches

A collection of cleanup patches to MAINTAINERS

I ran the script I submitted awhile back on MAINTAINERS after these [0/16] patches are applied.

http://lkml.org/lkml/2009/6/1/275

Quoted 7 lines

I think the result is useful for people that rely
on copy and paste of email addresses.

 MAINTAINERS | 2722 ++++++++++++++++++++---------------------------------------
 1 files changed, 908 insertions(+), 1814 deletions(-)

I don't think I want to have to maintain this patch for more than eight minutes.

Please send me a copy of that script so I can regenerate the patch when it breaks. I'll include it in the changelog of the patch, because there's a decent chance that the patch will get broken during just the several-hour lag between me pulling Linus's tree and sending patches at him.

I could maintain these 17-odd patches until 2.6.32 opens, but there's nothing to be gained by that so I think I'll hose them all Linuswards later this week.

author maintainer
#21 lore raw

Re: [PATCH] MAINTAINERS: Coalesce name and email address lines

Quoted 14 lines · Andrew Morton
Quoted 11 lines · On Mon, 13 Jul 2009 14:58:19 -0700 Joe Perches <[email protected]> wrote:
Quoted 1 line · Joe Perches

A collection of cleanup patches to MAINTAINERS

I ran the script I submitted awhile back on MAINTAINERS after these [0/16] patches are applied.

http://lkml.org/lkml/2009/6/1/275

I think the result is useful for people that rely
on copy and paste of email addresses.

Quoted 7 lines
Quoted 4 lines
 MAINTAINERS | 2722 ++++++++++++++++++++---------------------------------------
 1 files changed, 908 insertions(+), 1814 deletions(-)

I don't think I want to have to maintain this patch for more than eight minutes.

Neither would I...

Quoted 5 lines

Please send me a copy of that script so I can regenerate the patch when it breaks. I'll include it in the changelog of the patch, because there's a decent chance that the patch will get broken during just the several-hour lag between me pulling Linus's tree and sending patches at him.

Thanks. I wanted to get feedback though, so I sent the result.

Here's the script inline and as an attachment.

I've removed handling for the removed Cirrus Logic section and fixed a complaint about recent fuzz with stgit.

integrate_maintainers.sh new file +34 -0
new file mode 100755
index 0000000..b8ac2fa
@@ -0,0 +1,34 @@
+#! /bin/sh
+#
+# Change MAINTAINERS from
+#	P: name
+#	M: address
+# to:
+#	M: name <address>
+#
+# Integrate P: and M: lines
+#
+perl -i -e 'local $/; while(<>) { s@P:	([^\n]+)\nM:	([^\n]+)\n@M:	\1 <\2>\n@g; print; }' MAINTAINERS
+#
+# Quote names with periods, commas and parentheses
+#
+sed -r -i -e "s/^M:	(.+)([\.,'\(])(.*) </M:	\"\1\2\3\" </g" MAINTAINERS
+#
+# Add a description of email name style
+#
+patch -p1 <<EOF
+diff --git a/MAINTAINERS b/MAINTAINERS
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -73,8 +73,8 @@ Note: For the hard of thinking, this list is meant to remain in alphabetical
+ order. If you could add yourselves to it in alphabetical order that would be
+ so much easier [Ed]
+ 
+-P: Person
+-M: Mail patches to
++P: Person (obsolete)
++M: Mail patches to: FullName <address@domain>
+ L: Mailing list that is relevant to this area
+ W: Web-page with status/info
+ T: SCM tree type and location.  Type is one of: git, hg, quilt, stgit.
+EOF