lists to merlin

diff --git a/infradead/mailman/carisma.org.uk b/infradead/mailman/carisma.org.uk
index e36a91bd198ae725498c9206e4ea7bfd79a82ec9..856931e514eb089d7bba4c919d6112821ef92d05 100644 (file)
--- a/infradead/mailman/carisma.org.uk
+++ b/infradead/mailman/carisma.org.uk
@@ -1,7 +1,7 @@
-carisma-info:canuck.infradead.org
-carisma-committee:canuck.infradead.org
-carisma-instructors:canuck.infradead.org
-carisma-members:canuck.infradead.org
-carisma-test:canuck.infradead.org
-carisma-lessons:canuck.infradead.org
-mailman:canuck.infradead.org
+carisma-info:merlin.infradead.org
+carisma-committee:merlin.infradead.org
+carisma-instructors:merlin.infradead.org
+carisma-members:merlin.infradead.org
+carisma-test:merlin.infradead.org
+carisma-lessons:merlin.infradead.org
+mailman:merlin.infradead.org

diff --git a/infradead/mailman/carisma.slowglass.com b/infradead/mailman/carisma.slowglass.com
index e36a91bd198ae725498c9206e4ea7bfd79a82ec9..856931e514eb089d7bba4c919d6112821ef92d05 100644 (file)
--- a/infradead/mailman/carisma.slowglass.com
+++ b/infradead/mailman/carisma.slowglass.com
@@ -1,7 +1,7 @@
-carisma-info:canuck.infradead.org
-carisma-committee:canuck.infradead.org
-carisma-instructors:canuck.infradead.org
-carisma-members:canuck.infradead.org
-carisma-test:canuck.infradead.org
-carisma-lessons:canuck.infradead.org
-mailman:canuck.infradead.org
+carisma-info:merlin.infradead.org
+carisma-committee:merlin.infradead.org
+carisma-instructors:merlin.infradead.org
+carisma-members:merlin.infradead.org
+carisma-test:merlin.infradead.org
+carisma-lessons:merlin.infradead.org
+mailman:merlin.infradead.org

diff --git a/infradead/mailman/lists.infradead.org b/infradead/mailman/lists.infradead.org
index 6dd0e09f244431c09bf729ab2fe7d77419bdcfd0..7a3e50c9a1ee77cbbbdfd50bf742916d0fce8b68 100644 (file)
--- a/infradead/mailman/lists.infradead.org
+++ b/infradead/mailman/lists.infradead.org
@@ -1,36 +1,36 @@
-junk:canuck.infradead.org
-usbatm:canuck.infradead.org
-usbatm-commits:canuck.infradead.org
-linux-mtd:canuck.infradead.org
-linux-mtd-cvs:canuck.infradead.org
-linux-parport:canuck.infradead.org
-linux-pcmcia:canuck.infradead.org      
-linux-afs:canuck.infradead.org
-mailman:canuck.infradead.org
-opengfs-security:canuck.infradead.org
-testlist:canuck.infradead.org
-users:canuck.infradead.org
-sender-auth:canuck.infradead.org
-fedora-ppc:canuck.infradead.org
-mailman:canuck.infradead.org
-compsci:canuck.infradead.org
-neat:canuck.infradead.org
-VOID:canuck.infradead.org
-WIDER_VOID:canuck.infradead.org
-skigeek:canuck.infradead.org
-libertas-dev:canuck.infradead.org
-operationcambridge:canuck.infradead.org
-kexec:canuck.infradead.org
-linux-geode:canuck.infradead.org
-libnl:canuck.infradead.org
-openconnect-devel:canuck.infradead.org
-ptpd:canuck.infradead.org
-linux-arm:canuck.infradead.org
-linux-arm-kernel:canuck.infradead.org
-linux-arm-toolchain:canuck.infradead.org
-u-boot-v2:canuck.infradead.org
-barebox:canuck.infradead.org
-b43-dev:canuck.infradead.org
-get_iplayer:canuck.infradead.org
-wireless-regdb:canuck.infradead.org
-opentv:canuck.infradead.org
+junk:merlin.infradead.org
+usbatm:merlin.infradead.org
+usbatm-commits:merlin.infradead.org
+linux-mtd:merlin.infradead.org
+linux-mtd-cvs:merlin.infradead.org
+linux-parport:merlin.infradead.org
+linux-pcmcia:merlin.infradead.org      
+linux-afs:merlin.infradead.org
+mailman:merlin.infradead.org
+opengfs-security:merlin.infradead.org
+testlist:merlin.infradead.org
+users:merlin.infradead.org
+sender-auth:merlin.infradead.org
+fedora-ppc:merlin.infradead.org
+mailman:merlin.infradead.org
+compsci:merlin.infradead.org
+neat:merlin.infradead.org
+VOID:merlin.infradead.org
+WIDER_VOID:merlin.infradead.org
+skigeek:merlin.infradead.org
+libertas-dev:merlin.infradead.org
+operationcambridge:merlin.infradead.org
+kexec:merlin.infradead.org
+linux-geode:merlin.infradead.org
+libnl:merlin.infradead.org
+openconnect-devel:merlin.infradead.org
+ptpd:merlin.infradead.org
+linux-arm:merlin.infradead.org
+linux-arm-kernel:merlin.infradead.org
+linux-arm-toolchain:merlin.infradead.org
+u-boot-v2:merlin.infradead.org
+barebox:merlin.infradead.org
+b43-dev:merlin.infradead.org
+get_iplayer:merlin.infradead.org
+wireless-regdb:merlin.infradead.org
+opentv:merlin.infradead.org

diff --git a/infradead/mailman/netwinder.org b/infradead/mailman/netwinder.org
index 5d886f45bfa0e03da093a355351a03afb1d6a41b..1568fc21c975166202d47906241d235f27df38b8 100644 (file)
--- a/infradead/mailman/netwinder.org
+++ b/infradead/mailman/netwinder.org
@@ -1,2 +1,2 @@
-netwinder:canuck.infradead.org
-mailman:canuck.infradead.org
+netwinder:merlin.infradead.org
+mailman:merlin.infradead.org