Hi Len,
Today's linux-next merge of the acpi tree got a conflict in MAINTAINERS
between commit 4fa971811cda4036d84574bfb38bd9b22b5c35ec ("MN10300: MEI
are renaming themselves to Panasonic") from Linus' tree and commit
709ee531c153038d81b30649b9eeed3c44a4d5cc ("panasonic-laptop: add
Panasonic Let's Note laptop extras driver v0.94") from the acpi tree.
Just overlapping addition/move. I fixed it up (see below).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc MAINTAINERS
index 5d0b8a2,f9f6d4b..0000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3161,15 -3153,11 +3167,20 @@@ M: olof@xxxxxxxx
L: i2c@xxxxxxxxxxxxxx
S: Maintained
+ PANASONIC LAPTOP ACPI EXTRAS DRIVER
+ P: Harald Welte
+ M: laforge@xxxxxxxxxxxx
+ S: Maintained
+
+PANASONIC MN10300/AM33 PORT
+P: David Howells
+M: dhowells@xxxxxxxxxx
+P: Koichi Yasutake
+M: yasutake.koichi@xxxxxxxxxxxxxxxx
+L: linux-am33-list@xxxxxxxxxx (moderated for non-subscribers)
+W: ftp://ftp.redhat.com/pub/redhat/gnupro/AM33/
+S: Maintained
+
PARALLEL PORT SUPPORT
L: linux-parport@xxxxxxxxxxxxxxxxxxx (subscribers-only)
S: Orphan
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
