Re: RFC: make MAINTAINERS email addresses easier to copy/paste

[Bjorn Helgaas]

MAINTAINERS: straighten out Person <-> Mail associations

Sometimes a "P:" line contains several names, followed by an
"M:" line with several email addresses.  And sometimes a single
"P:" line is followed by several "M:" addresses for the same
person.

This patch adds extra "P:" lines to make the associations
unambiguous.

The first hunk is only relevant if we use the preceeding
script to fold the "P:" and "M:" lines together, but the rest
of the patch should be valid in any case.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>

Index: work10/MAINTAINERS
===================================================================
--- work10.orig/MAINTAINERS	2008-04-29 13:31:06.000000000 -0600
+++ work10/MAINTAINERS	2008-04-29 14:45:16.000000000 -0600
@@ -67,8 +67,8 @@
 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 with email address, e.g., "Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>"
+M: Additional email address for patches
 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.
@@ -218,6 +218,7 @@
 ACPI
 P:	Len Brown
 M:	len.brown@xxxxxxxxx
+P:	Len Brown
 M:	lenb@xxxxxxxxxx
 L:	linux-acpi@xxxxxxxxxxxxxxx
 W:	http://www.lesswatts.org/projects/acpi/
@@ -1112,11 +1113,14 @@
 L:	alsa-devel@xxxxxxxxxxxxxxxx
 S:	Supported
 
+CIRRUS LOGIC CS4280/CS461x SOUNDDRIVER (2.2 kernel driver)
+P:	Thomas Woller
+M:	twoller@xxxxxxxxxxxxxxxxxx
+S:	Maintained
+
 CIRRUS LOGIC CS4280/CS461x SOUNDDRIVER
-P:	Cirrus Logic Corporation (kernel 2.2 driver)
-M:	Cirrus Logic Corporation, Thomas Woller <twoller@xxxxxxxxxxxxxxxxxx>
-P:	Nils Faerber (port to kernel 2.4)
-M:	Nils Faerber <nils@xxxxxxxxxxxxxxxxx>
+P:	Nils Faerber
+M:	nils@xxxxxxxxxxxxxxxxx
 S:	Maintained
 
 CODA FILE SYSTEM
@@ -1130,6 +1134,7 @@
 COMPACTPCI HOTPLUG CORE
 P:	Scott Murray
 M:	scottm@xxxxxxxxxxxxxxxx
+P:	Scott Murray
 M:	scott@xxxxxxxxxxxx
 L:	pcihpd-discuss@xxxxxxxxxxxxxxxxxxxxx
 S:	Supported
@@ -1137,6 +1142,7 @@
 COMPACTPCI HOTPLUG ZIATECH ZT5550 DRIVER
 P:	Scott Murray
 M:	scottm@xxxxxxxxxxxxxxxx
+P:	Scott Murray
 M:	scott@xxxxxxxxxxxx
 L:	pcihpd-discuss@xxxxxxxxxxxxxxxxxxxxx
 S:	Supported
@@ -1144,6 +1150,7 @@
 COMPACTPCI HOTPLUG GENERIC DRIVER
 P:	Scott Murray
 M:	scottm@xxxxxxxxxxxxxxxx
+P:	Scott Murray
 M:	scott@xxxxxxxxxxxx
 L:	pcihpd-discuss@xxxxxxxxxxxxxxxxxxxxx
 S:	Supported
@@ -1194,8 +1201,8 @@
 
 CPUSETS
 P:	Paul Jackson
-P:	Simon Derr
 M:	pj@xxxxxxx
+P:	Simon Derr
 M:	simon.derr@xxxxxxxx
 L:	linux-kernel@xxxxxxxxxxxxxxx
 W:	http://www.bullopensource.org/cpuset/
@@ -1458,8 +1465,10 @@
 S:	Maintained
 
 ECRYPT FILE SYSTEM
-P:	Mike Halcrow, Phillip Hellewell
-M:	mhalcrow@xxxxxxxxxx, phillip@xxxxxxxxxxxxxxxxxxxx
+P:	Mike Halcrow
+M:	mhalcrow@xxxxxxxxxx
+P:	Phillip Hellewell
+M:	phillip@xxxxxxxxxxxxxxxxxxxx
 L:	ecryptfs-devel@xxxxxxxxxxxxxxxxxxxxx
 W:	http://ecryptfs.sourceforge.net/
 S:	Supported
@@ -1473,8 +1482,8 @@
 
 EDAC-E752X
 P:	Mark Gross
-P:	Doug Thompson
 M:	mark.gross@xxxxxxxxx
+P:	Doug Thompson
 M:	dougthompson@xxxxxxxxxxxx
 L:	bluesmoke-devel@xxxxxxxxxxxxxxxxxxxxx
 W:	bluesmoke.sourceforge.net
@@ -1510,8 +1519,8 @@
 
 EDAC-I82975X
 P:	Ranganathan Desikan
-P:	Arvind R.
 M:	rdesikan@xxxxxxxxxxxxxxxxx
+P:	Arvind R.
 M:	arvind@xxxxxxxxxxx
 L:	bluesmoke-devel@xxxxxxxxxxxxxxxxxxxxx
 W:	bluesmoke.sourceforge.net
@@ -1557,7 +1566,9 @@
 
 EPSON 1355 FRAMEBUFFER DRIVER
 P:	Christopher Hoover
-M:	ch@xxxxxxxxxxxxxx, ch@xxxxxxxxxx
+M:	ch@xxxxxxxxxxxxxx
+P:	Christopher Hoover
+M:	ch@xxxxxxxxxx
 S:	Maintained
 
 ETHEREXPRESS-16 NETWORK DRIVER
@@ -1583,14 +1594,22 @@
 S:	Maintained
 
 EXT3 FILE SYSTEM
-P:	Stephen Tweedie, Andrew Morton
-M:	sct@xxxxxxxxxx, akpm@xxxxxxxxxxxxxxxxxxxx, adilger@xxxxxxxxxxxxx
+P:	Stephen Tweedie
+M:	sct@xxxxxxxxxx
+P:	Andrew Morton
+M:	akpm@xxxxxxxxxxxxxxxxxxxx
+P:	Andreas Dilger
+M:	adilger@xxxxxxxxxxxxx
 L:	linux-ext4@xxxxxxxxxxxxxxx
 S:	Maintained
 
 EXT4 FILE SYSTEM
-P:	Stephen Tweedie, Andrew Morton
-M:	sct@xxxxxxxxxx, akpm@xxxxxxxxxxxxxxxxxxxx, adilger@xxxxxxxxxxxxx
+P:	Stephen Tweedie
+M:	sct@xxxxxxxxxx
+P:	Andrew Morton
+M:	akpm@xxxxxxxxxxxxxxxxxxxx
+P:	Andreas Dilger
+M:	adilger@xxxxxxxxxxxxx
 L:	linux-ext4@xxxxxxxxxxxxxxx
 S:	Maintained
 
@@ -1619,7 +1638,7 @@
 S:	Maintained
 
 FREESCALE DMA DRIVER
-P;	Zhang Wei
+P:	Zhang Wei
 M:	wei.zhang@xxxxxxxxxxxxx
 L:	linuxppc-embedded@xxxxxxxxxx
 L:	linux-kernel@xxxxxxxxxxxxxxx
@@ -1680,8 +1699,10 @@
 S:	Maintained
 
 FIREWIRE SUBSYSTEM (drivers/firewire, <linux/firewire*.h>)
-P:	Kristian Hoegsberg, Stefan Richter
-M:	krh@xxxxxxxxxx, stefanr@xxxxxxxxxxxxxxxxx
+P:	Kristian Hoegsberg
+M:	krh@xxxxxxxxxx
+P:	Stefan Richter
+M:	stefanr@xxxxxxxxxxxxxxxxx
 L:	linux1394-devel@xxxxxxxxxxxxxxxxxxxxx
 W:	http://www.linux1394.org/
 T:	git kernel.org:/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
@@ -1778,7 +1799,7 @@
 HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
 P:	Robert Love
 M:	rlove@xxxxxxxxx
-M:	linux-kernel@xxxxxxxxxxxxxxx
+L:	linux-kernel@xxxxxxxxxxxxxxx
 W:	http://www.kernel.org/pub/linux/kernel/people/rml/hdaps/
 S:	Maintained
 
@@ -2041,6 +2062,7 @@
 INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS
 P:	Dmitry Torokhov
 M:	dmitry.torokhov@xxxxxxxxx
+P:	Dmitry Torokhov
 M:	dtor@xxxxxxx
 L:	linux-input@xxxxxxxxxxxxxxx
 T:	git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git
@@ -2261,8 +2283,10 @@
 S:	Supported
 
 JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
-P:	Stephen Tweedie, Andrew Morton
-M:	sct@xxxxxxxxxx, akpm@xxxxxxxxxxxxxxxxxxxx
+P:	Stephen Tweedie
+M:	sct@xxxxxxxxxx
+P:	Andrew Morton
+M:	akpm@xxxxxxxxxxxxxxxxxxxx
 L:	linux-ext4@xxxxxxxxxxxxxxx
 S:	Maintained
 
@@ -2509,9 +2533,11 @@
 LINUX FOR 64BIT POWERPC
 P:	Paul Mackerras
 M:	paulus@xxxxxxxxx
+P:	Paul Mackerras
 M:	paulus@xxxxxxxxxx
 P:	Anton Blanchard
 M:	anton@xxxxxxxxx
+P:	Anton Blanchard
 M:	anton@xxxxxxxxxx
 W:	http://www.penguinppc.org/ppc64/
 L:	linuxppc-dev@xxxxxxxxxx
@@ -3901,7 +3927,7 @@
 
 TI OMAP MMC INTERFACE DRIVER
 P:	Carlos Aguiar, Anderson Briglia and Syed Khasim
-M:	linux-omap-open-source@xxxxxxxxxxxxxx (subscribers only)
+L:	linux-omap-open-source@xxxxxxxxxxxxxx (subscribers only)
 W:	http://linux.omap.com
 W:	http://www.muru.com/linux/omap/
 S:	Maintained
@@ -4137,8 +4163,9 @@
 S:	Maintained
 
 USB SERIAL DIGI ACCELEPORT DRIVER
-P:	Peter Berger and Al Borchers
+P:	Peter Berger
 M:	pberger@xxxxxxxxxxx
+P:	Al Borchers
 M:	alborchers@xxxxxxxxxxxxxxxx
 L:      linux-usb@xxxxxxxxxxxxxxx
 S:	Maintained
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/