diff --git a/board/LaCie/net2big_v2/MAINTAINERS b/board/LaCie/net2big_v2/MAINTAINERS
index 1afaa5ce5cbb7cddb0645b238e900ffeb6ebab61..205c75e4cbe4ddd48ba217a14e5b0263af2179b7 100644
--- a/board/LaCie/net2big_v2/MAINTAINERS
+++ b/board/LaCie/net2big_v2/MAINTAINERS
@@ -1,5 +1,5 @@
 NET2BIG_V2 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/LaCie/net2big_v2/
 F:	include/configs/lacie_kw.h
diff --git a/board/LaCie/netspace_v2/MAINTAINERS b/board/LaCie/netspace_v2/MAINTAINERS
index ad3dfa1565d938122fc9379ed5c56abcb50072f5..55fd50d4eb1bd3850d8425eaff30e7c0c537008c 100644
--- a/board/LaCie/netspace_v2/MAINTAINERS
+++ b/board/LaCie/netspace_v2/MAINTAINERS
@@ -8,7 +8,7 @@ F:	configs/netspace_max_v2_defconfig
 F:	configs/netspace_v2_defconfig
 
 NETSPACE_LITE_V2 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	configs/netspace_lite_v2_defconfig
 F:	configs/netspace_mini_v2_defconfig
diff --git a/board/LaCie/wireless_space/MAINTAINERS b/board/LaCie/wireless_space/MAINTAINERS
index 8b36bff32bcd40fc22d6ffb83870f309142a008e..8a27b9a234a46b506978528ab75ed57ae399de47 100644
--- a/board/LaCie/wireless_space/MAINTAINERS
+++ b/board/LaCie/wireless_space/MAINTAINERS
@@ -1,5 +1,5 @@
 WIRELESS_SPACE BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/LaCie/wireless_space/
 F:	include/configs/wireless_space.h
diff --git a/board/Marvell/db64360/MAINTAINERS b/board/Marvell/db64360/MAINTAINERS
index 7383207f7563d694f1c97a8e76782a3c8ca599e5..af3eb24a2b002378d2262ff43f41d9dc88f4c9ce 100644
--- a/board/Marvell/db64360/MAINTAINERS
+++ b/board/Marvell/db64360/MAINTAINERS
@@ -1,5 +1,5 @@
 DB64360 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/Marvell/db64360/
 F:	include/configs/DB64360.h
diff --git a/board/Marvell/db64460/MAINTAINERS b/board/Marvell/db64460/MAINTAINERS
index 751aac2be362ae520773c630ea290700a11a7632..a30c51c54be86d086798fe009c9a3e7909676b8e 100644
--- a/board/Marvell/db64460/MAINTAINERS
+++ b/board/Marvell/db64460/MAINTAINERS
@@ -1,5 +1,5 @@
 DB64460 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/Marvell/db64460/
 F:	include/configs/DB64460.h
diff --git a/board/Marvell/openrd/MAINTAINERS b/board/Marvell/openrd/MAINTAINERS
index 7a52a8eeeecc94e297da4fc688fd26311037970e..7a189ab6d52be9fdac5093772ea576756116cbda 100644
--- a/board/Marvell/openrd/MAINTAINERS
+++ b/board/Marvell/openrd/MAINTAINERS
@@ -6,7 +6,7 @@ F:	include/configs/openrd.h
 F:	configs/openrd_base_defconfig
 
 OPENRD_CLIENT BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	configs/openrd_client_defconfig
 F:	configs/openrd_ultimate_defconfig
diff --git a/board/a3000/MAINTAINERS b/board/a3000/MAINTAINERS
index 2d8560f628f30af9c1d486dd822b5b5025abe803..303e5fdacb7004d5e22ca66c71c869bb635abb9c 100644
--- a/board/a3000/MAINTAINERS
+++ b/board/a3000/MAINTAINERS
@@ -1,5 +1,5 @@
 A3000 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/a3000/
 F:	include/configs/A3000.h
diff --git a/board/amcc/bubinga/MAINTAINERS b/board/amcc/bubinga/MAINTAINERS
index 9d5ace2ae519b05b04ca6df6b1dc3670872aae54..3299cc34e367368c4956f3a2869ffedff24e8ca1 100644
--- a/board/amcc/bubinga/MAINTAINERS
+++ b/board/amcc/bubinga/MAINTAINERS
@@ -1,5 +1,5 @@
 BUBINGA BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/amcc/bubinga/
 F:	include/configs/bubinga.h
diff --git a/board/amcc/yucca/MAINTAINERS b/board/amcc/yucca/MAINTAINERS
index 066300398471091138ee4f6ba03a2c817e49434c..1cbdb0e70db2e759ce77af76b8d803966304e02d 100644
--- a/board/amcc/yucca/MAINTAINERS
+++ b/board/amcc/yucca/MAINTAINERS
@@ -1,5 +1,5 @@
 YUCCA BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/amcc/yucca/
 F:	include/configs/yucca.h
diff --git a/board/armltd/versatile/MAINTAINERS b/board/armltd/versatile/MAINTAINERS
index f390e53307a5145a4e4483b5d84e946fab9ff218..a56dd99bb33df68e7bc3c81b260800ca1a2e5a26 100644
--- a/board/armltd/versatile/MAINTAINERS
+++ b/board/armltd/versatile/MAINTAINERS
@@ -1,5 +1,5 @@
 VERSATILE BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/armltd/versatile/
 F:	include/configs/versatile.h
diff --git a/board/armltd/vexpress/MAINTAINERS b/board/armltd/vexpress/MAINTAINERS
index b0834e4d487bf685d3015ce43133e98b0193c833..a6943d742690707bf13a80fce48b69a2f5bdf172 100644
--- a/board/armltd/vexpress/MAINTAINERS
+++ b/board/armltd/vexpress/MAINTAINERS
@@ -1,5 +1,5 @@
 VEXPRESS BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/armltd/vexpress/
 F:	include/configs/vexpress_ca15_tc2.h
diff --git a/board/bc3450/MAINTAINERS b/board/bc3450/MAINTAINERS
index e2a8363d8fc023c0312b7ab52485006be96d5b6f..81a7076093109fbd90ca6d14aa4f4c398799f99c 100644
--- a/board/bc3450/MAINTAINERS
+++ b/board/bc3450/MAINTAINERS
@@ -1,5 +1,5 @@
 BC3450 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/bc3450/
 F:	include/configs/BC3450.h
diff --git a/board/canmb/MAINTAINERS b/board/canmb/MAINTAINERS
index aa4eb301c0afbaf733017468254b0780148fb76f..71750ead4789dbf35913d70ab091bb6b4512f939 100644
--- a/board/canmb/MAINTAINERS
+++ b/board/canmb/MAINTAINERS
@@ -1,5 +1,5 @@
 CANMB BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/canmb/
 F:	include/configs/canmb.h
diff --git a/board/cm41xx/MAINTAINERS b/board/cm41xx/MAINTAINERS
index f308b0fb29fcc3d53ce042c49a20c4c2c1928c2f..f10eeb58f3699d9a77179ef9d911379f103b2da5 100644
--- a/board/cm41xx/MAINTAINERS
+++ b/board/cm41xx/MAINTAINERS
@@ -1,5 +1,5 @@
 CM41XX BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/cm41xx/
 F:	include/configs/cm41xx.h
diff --git a/board/cm5200/MAINTAINERS b/board/cm5200/MAINTAINERS
index 9fc5365148ca659e71914d99e02d859cba9e9d0e..1e1df3f6dcb334ecf29fdc2e2a79fe1ef5a4e5ee 100644
--- a/board/cm5200/MAINTAINERS
+++ b/board/cm5200/MAINTAINERS
@@ -1,5 +1,5 @@
 CM5200 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/cm5200/
 F:	include/configs/cm5200.h
diff --git a/board/cmi/MAINTAINERS b/board/cmi/MAINTAINERS
index ab33d5d02d632ca4cf6a5b537ec17f349c7d19c2..60701bfd9995ccf6378bb5d0a179faedeaf87b22 100644
--- a/board/cmi/MAINTAINERS
+++ b/board/cmi/MAINTAINERS
@@ -1,5 +1,5 @@
 CMI BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/cmi/
 F:	include/configs/cmi_mpc5xx.h
diff --git a/board/cobra5272/MAINTAINERS b/board/cobra5272/MAINTAINERS
index 00942fc2fc1895c53711438cf73610d7a408b5cf..a064da2f15c5886aaea7a1e6cca9507cdc0ae986 100644
--- a/board/cobra5272/MAINTAINERS
+++ b/board/cobra5272/MAINTAINERS
@@ -1,5 +1,5 @@
 COBRA5272 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/cobra5272/
 F:	include/configs/cobra5272.h
diff --git a/board/cpu87/MAINTAINERS b/board/cpu87/MAINTAINERS
index 6e84f601f5ca7aa8fee43a0dfe73494d0eeb2390..32804ea53c8359c9f7c4ef49b807681b4540aba4 100644
--- a/board/cpu87/MAINTAINERS
+++ b/board/cpu87/MAINTAINERS
@@ -1,5 +1,5 @@
 CPU87 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/cpu87/
 F:	include/configs/CPU87.h
diff --git a/board/dave/PPChameleonEVB/MAINTAINERS b/board/dave/PPChameleonEVB/MAINTAINERS
index 3af5b5704be466ec3f11c5077a35eaaaddc47303..d43c6d03f2b096c22c57d14a119abb306e3ae73b 100644
--- a/board/dave/PPChameleonEVB/MAINTAINERS
+++ b/board/dave/PPChameleonEVB/MAINTAINERS
@@ -1,5 +1,5 @@
 PPCHAMELEONEVB BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/dave/PPChameleonEVB/
 F:	include/configs/CATcenter.h
diff --git a/board/davinci/dvevm/MAINTAINERS b/board/davinci/dvevm/MAINTAINERS
index 4b3ce45d4f3ca80fd4c134ffab794a83523154e2..a718b900508a4774d90da04916e637b4077aca5d 100644
--- a/board/davinci/dvevm/MAINTAINERS
+++ b/board/davinci/dvevm/MAINTAINERS
@@ -1,5 +1,5 @@
 DVEVM BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/davinci/dvevm/
 F:	include/configs/davinci_dvevm.h
diff --git a/board/davinci/schmoogie/MAINTAINERS b/board/davinci/schmoogie/MAINTAINERS
index b1fc29c019686ab6a885868ec3f3acf9c7b74ac8..808e7fc04680f7cb417e4b375aa3c3e9b4dea8d4 100644
--- a/board/davinci/schmoogie/MAINTAINERS
+++ b/board/davinci/schmoogie/MAINTAINERS
@@ -1,5 +1,5 @@
 SCHMOOGIE BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/davinci/schmoogie/
 F:	include/configs/davinci_schmoogie.h
diff --git a/board/davinci/sffsdr/MAINTAINERS b/board/davinci/sffsdr/MAINTAINERS
index 428d003abcf335a7a11cad18cfabc9dc5d682952..5c7e1324a9fa20885c9623f53d865a33628ec2f5 100644
--- a/board/davinci/sffsdr/MAINTAINERS
+++ b/board/davinci/sffsdr/MAINTAINERS
@@ -1,5 +1,5 @@
 SFFSDR BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/davinci/sffsdr/
 F:	include/configs/davinci_sffsdr.h
diff --git a/board/davinci/sonata/MAINTAINERS b/board/davinci/sonata/MAINTAINERS
index 625978ca626fe91e111d49ecaee74b12a1bbe390..40659e5210f2acf73a582190e1be95694dbd1981 100644
--- a/board/davinci/sonata/MAINTAINERS
+++ b/board/davinci/sonata/MAINTAINERS
@@ -1,5 +1,5 @@
 SONATA BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/davinci/sonata/
 F:	include/configs/davinci_sonata.h
diff --git a/board/eltec/elppc/MAINTAINERS b/board/eltec/elppc/MAINTAINERS
index 5258b3a7ca6e99b1e53c755d658d01d5537c5cc0..e3b35f110121c3901e8594d17614455b0dea9bda 100644
--- a/board/eltec/elppc/MAINTAINERS
+++ b/board/eltec/elppc/MAINTAINERS
@@ -1,5 +1,5 @@
 ELPPC BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/eltec/elppc/
 F:	include/configs/ELPPC.h
diff --git a/board/ep82xxm/MAINTAINERS b/board/ep82xxm/MAINTAINERS
index 822261be78296044c4d7e33ef2d04976bedc6dbd..c053df9160f36af2d3b9b594de2bd88a3e19ef07 100644
--- a/board/ep82xxm/MAINTAINERS
+++ b/board/ep82xxm/MAINTAINERS
@@ -1,5 +1,5 @@
 EP82XXM BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/ep82xxm/
 F:	include/configs/ep82xxm.h
diff --git a/board/esg/ima3-mx53/MAINTAINERS b/board/esg/ima3-mx53/MAINTAINERS
index c434eb93a30538de986c3214195f10a6a3cdcd2e..96de0815c7ea0eca02ed2a8b8baf9870245220a3 100644
--- a/board/esg/ima3-mx53/MAINTAINERS
+++ b/board/esg/ima3-mx53/MAINTAINERS
@@ -1,5 +1,5 @@
 IMA3-MX53 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/esg/ima3-mx53/
 F:	include/configs/ima3-mx53.h
diff --git a/board/espt/MAINTAINERS b/board/espt/MAINTAINERS
index ff6e20c067983e77eb68b82ef046e38a01036153..fdbbc3eb454ab84ba3a1e2d4d52a0f29e4c41d5e 100644
--- a/board/espt/MAINTAINERS
+++ b/board/espt/MAINTAINERS
@@ -1,5 +1,5 @@
 ESPT BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/espt/
 F:	include/configs/espt.h
diff --git a/board/freescale/b4860qds/MAINTAINERS b/board/freescale/b4860qds/MAINTAINERS
index 9f9a612a61eef7709a4a96975355046a86e57c54..ac02bb7e48185662ad4c39db5e2e65a68333b398 100644
--- a/board/freescale/b4860qds/MAINTAINERS
+++ b/board/freescale/b4860qds/MAINTAINERS
@@ -1,5 +1,5 @@
 B4860QDS BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/b4860qds/
 F:	include/configs/B4860QDS.h
diff --git a/board/freescale/corenet_ds/MAINTAINERS b/board/freescale/corenet_ds/MAINTAINERS
index 841d82fdd8af676a772864f91f0ce2891d11ccf5..c8ca6746f19164a27caabbf72c007b5ae4f99e91 100644
--- a/board/freescale/corenet_ds/MAINTAINERS
+++ b/board/freescale/corenet_ds/MAINTAINERS
@@ -1,5 +1,5 @@
 CORENET_DS BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/corenet_ds/
 F:	include/configs/P3041DS.h
diff --git a/board/freescale/m5208evbe/MAINTAINERS b/board/freescale/m5208evbe/MAINTAINERS
index 65d04df2502807f71ddc7c0621824a16d4f2e517..c9c3c882e60b980f254e440cfe08f287fb2efdf8 100644
--- a/board/freescale/m5208evbe/MAINTAINERS
+++ b/board/freescale/m5208evbe/MAINTAINERS
@@ -1,5 +1,5 @@
 M5208EVBE BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/m5208evbe/
 F:	include/configs/M5208EVBE.h
diff --git a/board/freescale/m5249evb/MAINTAINERS b/board/freescale/m5249evb/MAINTAINERS
index 22301b770e95164ece846d58c746b5ccfc07f93e..c2273c35e1de8a5f0b7ed2848bec372717bb52ae 100644
--- a/board/freescale/m5249evb/MAINTAINERS
+++ b/board/freescale/m5249evb/MAINTAINERS
@@ -1,5 +1,5 @@
 M5249EVB BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/m5249evb/
 F:	include/configs/M5249EVB.h
diff --git a/board/freescale/m5272c3/MAINTAINERS b/board/freescale/m5272c3/MAINTAINERS
index aa4739f744c64011fe45ca766e616adeffdf527b..e58663096d43c4dda9a79b4c3dacd5591ad2a374 100644
--- a/board/freescale/m5272c3/MAINTAINERS
+++ b/board/freescale/m5272c3/MAINTAINERS
@@ -1,5 +1,5 @@
 M5272C3 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/m5272c3/
 F:	include/configs/M5272C3.h
diff --git a/board/freescale/m5275evb/MAINTAINERS b/board/freescale/m5275evb/MAINTAINERS
index b87d52c64fbf85d6c25634da2be9020f989a8987..4e6dbb12d99d0e0124bf7feac9b2acd60db8506a 100644
--- a/board/freescale/m5275evb/MAINTAINERS
+++ b/board/freescale/m5275evb/MAINTAINERS
@@ -1,5 +1,5 @@
 M5275EVB BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/m5275evb/
 F:	include/configs/M5275EVB.h
diff --git a/board/freescale/m5282evb/MAINTAINERS b/board/freescale/m5282evb/MAINTAINERS
index f945ab446b1053f4e5b03ed97b85ce8a54402c18..305e748e7402f337bc44e58bbe072cfa958e207f 100644
--- a/board/freescale/m5282evb/MAINTAINERS
+++ b/board/freescale/m5282evb/MAINTAINERS
@@ -1,5 +1,5 @@
 M5282EVB BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/m5282evb/
 F:	include/configs/M5282EVB.h
diff --git a/board/freescale/m54418twr/MAINTAINERS b/board/freescale/m54418twr/MAINTAINERS
index 37b24c7be8c75862287ba4ee007e335b770a9ba2..f88aed99d657987f4405f0232fbdd4aaf470a226 100644
--- a/board/freescale/m54418twr/MAINTAINERS
+++ b/board/freescale/m54418twr/MAINTAINERS
@@ -1,5 +1,5 @@
 M54418TWR BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/m54418twr/
 F:	include/configs/M54418TWR.h
diff --git a/board/freescale/m54451evb/MAINTAINERS b/board/freescale/m54451evb/MAINTAINERS
index be145494cbdc4cd517cc358d6f2bd08b2f734559..52a2681080946080dedf742cc3c1dc0df22e12be 100644
--- a/board/freescale/m54451evb/MAINTAINERS
+++ b/board/freescale/m54451evb/MAINTAINERS
@@ -1,5 +1,5 @@
 M54451EVB BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/m54451evb/
 F:	include/configs/M54451EVB.h
diff --git a/board/freescale/mpc5121ads/MAINTAINERS b/board/freescale/mpc5121ads/MAINTAINERS
index 0c7f682f95a0e75f8d3fd71ac54e157e70986554..d4aab8fb51fdcce57dc8bba0fc5cd9855825e127 100644
--- a/board/freescale/mpc5121ads/MAINTAINERS
+++ b/board/freescale/mpc5121ads/MAINTAINERS
@@ -1,5 +1,5 @@
 MPC5121ADS BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/mpc5121ads/
 F:	include/configs/mpc5121ads.h
diff --git a/board/freescale/mpc8313erdb/MAINTAINERS b/board/freescale/mpc8313erdb/MAINTAINERS
index 923ba95404cf6c1f25c35645facd52ca2b47d5e4..807fb0b6e9ebb0773ba2837e2f7989154ea99751 100644
--- a/board/freescale/mpc8313erdb/MAINTAINERS
+++ b/board/freescale/mpc8313erdb/MAINTAINERS
@@ -1,5 +1,5 @@
 MPC8313ERDB BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/mpc8313erdb/
 F:	include/configs/MPC8313ERDB.h
diff --git a/board/freescale/mpc8349itx/MAINTAINERS b/board/freescale/mpc8349itx/MAINTAINERS
index ed6e4e54dd4bb8e94cad6cfd21af34e835a25dc6..d0388ad6e55cbe4c855abb7cdb3dca21968ea7fd 100644
--- a/board/freescale/mpc8349itx/MAINTAINERS
+++ b/board/freescale/mpc8349itx/MAINTAINERS
@@ -1,5 +1,5 @@
 MPC8349ITX BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/mpc8349itx/
 F:	include/configs/MPC8349ITX.h
diff --git a/board/freescale/mpc8536ds/MAINTAINERS b/board/freescale/mpc8536ds/MAINTAINERS
index 51d7cd7bac1b322116c8621a4dddef087eb3521c..953072cdd0f381ca816dd9f70e71a55782aea632 100644
--- a/board/freescale/mpc8536ds/MAINTAINERS
+++ b/board/freescale/mpc8536ds/MAINTAINERS
@@ -1,5 +1,5 @@
 MPC8536DS BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/mpc8536ds/
 F:	include/configs/MPC8536DS.h
diff --git a/board/freescale/mpc8544ds/MAINTAINERS b/board/freescale/mpc8544ds/MAINTAINERS
index 81b664c7323264dc2c437b2d1e4c5dd20e6c9ea8..328be7fecce68887fb0e809200909a7229aa34f3 100644
--- a/board/freescale/mpc8544ds/MAINTAINERS
+++ b/board/freescale/mpc8544ds/MAINTAINERS
@@ -1,5 +1,5 @@
 MPC8544DS BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/mpc8544ds/
 F:	include/configs/MPC8544DS.h
diff --git a/board/freescale/mpc8548cds/MAINTAINERS b/board/freescale/mpc8548cds/MAINTAINERS
index 89b2425d0baac7a4909f7730b19588b59a83d0f5..6f229227c03fca1febe010fc63d751e2da7815c7 100644
--- a/board/freescale/mpc8548cds/MAINTAINERS
+++ b/board/freescale/mpc8548cds/MAINTAINERS
@@ -1,5 +1,5 @@
 MPC8548CDS BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/mpc8548cds/
 F:	include/configs/MPC8548CDS.h
diff --git a/board/freescale/mpc8568mds/MAINTAINERS b/board/freescale/mpc8568mds/MAINTAINERS
index 72c25f5f8ea8afd13c01de5066be03321afbd080..379d8cc1d5f3cae28d8507105689caeb926c0379 100644
--- a/board/freescale/mpc8568mds/MAINTAINERS
+++ b/board/freescale/mpc8568mds/MAINTAINERS
@@ -1,5 +1,5 @@
 MPC8568MDS BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/mpc8568mds/
 F:	include/configs/MPC8568MDS.h
diff --git a/board/freescale/mpc8569mds/MAINTAINERS b/board/freescale/mpc8569mds/MAINTAINERS
index b5478dbc175fbb9e0d4c095c180948faabd62c92..c181407f25861d73da9c0bf37af23ecb4d3ca75f 100644
--- a/board/freescale/mpc8569mds/MAINTAINERS
+++ b/board/freescale/mpc8569mds/MAINTAINERS
@@ -1,5 +1,5 @@
 MPC8569MDS BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/mpc8569mds/
 F:	include/configs/MPC8569MDS.h
diff --git a/board/freescale/mpc8610hpcd/MAINTAINERS b/board/freescale/mpc8610hpcd/MAINTAINERS
index 993c02a15e446717701d320f1821d3de7710b0f0..de6ab89299773723c3b17eaabd8d0893fb8395f3 100644
--- a/board/freescale/mpc8610hpcd/MAINTAINERS
+++ b/board/freescale/mpc8610hpcd/MAINTAINERS
@@ -1,5 +1,5 @@
 MPC8610HPCD BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/mpc8610hpcd/
 F:	include/configs/MPC8610HPCD.h
diff --git a/board/freescale/p1010rdb/MAINTAINERS b/board/freescale/p1010rdb/MAINTAINERS
index 579e775972e017622104fef9c8688c1fd99b6b9b..db001437b1697b1609dc26bb193e81a3a3a0809e 100644
--- a/board/freescale/p1010rdb/MAINTAINERS
+++ b/board/freescale/p1010rdb/MAINTAINERS
@@ -1,5 +1,5 @@
 P1010RDB BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/p1010rdb/
 F:	include/configs/P1010RDB.h
diff --git a/board/freescale/p1023rdb/MAINTAINERS b/board/freescale/p1023rdb/MAINTAINERS
index 81501aa5fc5048fe45d1fa388004a64dae23816b..c06bac6d0d8761a6df1dcd70cca559ebae9fce5f 100644
--- a/board/freescale/p1023rdb/MAINTAINERS
+++ b/board/freescale/p1023rdb/MAINTAINERS
@@ -1,5 +1,5 @@
 P1023RDB BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/p1023rdb/
 F:	include/configs/P1023RDB.h
diff --git a/board/freescale/p1_p2_rdb/MAINTAINERS b/board/freescale/p1_p2_rdb/MAINTAINERS
index ad0a8589f47c2dac656507823f5acdee48e2a2c6..aabf587dd68539dc9a8b286bf0740752f85668bf 100644
--- a/board/freescale/p1_p2_rdb/MAINTAINERS
+++ b/board/freescale/p1_p2_rdb/MAINTAINERS
@@ -1,5 +1,5 @@
 P1_P2_RDB BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/p1_p2_rdb/
 F:	include/configs/P1_P2_RDB.h
diff --git a/board/freescale/p1_p2_rdb_pc/MAINTAINERS b/board/freescale/p1_p2_rdb_pc/MAINTAINERS
index 4d429fe9cf3aaeff148ed942d6ff4ac68932ee84..c2e924798e321f914d8c8a6063cec8f0bb45a088 100644
--- a/board/freescale/p1_p2_rdb_pc/MAINTAINERS
+++ b/board/freescale/p1_p2_rdb_pc/MAINTAINERS
@@ -1,5 +1,5 @@
 P1_P2_RDB_PC BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/p1_p2_rdb_pc/
 F:	include/configs/p1_p2_rdb_pc.h
diff --git a/board/freescale/p1_twr/MAINTAINERS b/board/freescale/p1_twr/MAINTAINERS
index 2d7d7e10c5886b53e19fc4eb7e0d204de6142a8d..c19d43616b1bdffcbbd50741b80dd01fa8304c48 100644
--- a/board/freescale/p1_twr/MAINTAINERS
+++ b/board/freescale/p1_twr/MAINTAINERS
@@ -1,5 +1,5 @@
 P1_TWR BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/p1_twr/
 F:	include/configs/p1_twr.h
diff --git a/board/freescale/p2020ds/MAINTAINERS b/board/freescale/p2020ds/MAINTAINERS
index 42cb18dc8b2f6e4fc9e5ac406f90a3a8badad0c3..cb61fc51fbdfcb0eca2d4c852d8d15c8639b6ba7 100644
--- a/board/freescale/p2020ds/MAINTAINERS
+++ b/board/freescale/p2020ds/MAINTAINERS
@@ -1,5 +1,5 @@
 P2020DS BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/p2020ds/
 F:	include/configs/P2020DS.h
diff --git a/board/freescale/p2041rdb/MAINTAINERS b/board/freescale/p2041rdb/MAINTAINERS
index bb5bb83f3060a77fe65c464db59fbc146d6f1533..d93cb0bebb67cf698e2d3dbe5eec473517a8ba31 100644
--- a/board/freescale/p2041rdb/MAINTAINERS
+++ b/board/freescale/p2041rdb/MAINTAINERS
@@ -1,5 +1,5 @@
 P2041RDB BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/p2041rdb/
 F:	include/configs/P2041RDB.h
diff --git a/board/freescale/t104xrdb/MAINTAINERS b/board/freescale/t104xrdb/MAINTAINERS
index 364b0a961e12f0735f2438b662b59546c3b1783c..a4775c02e621f2b795c4be7c71578dd394338005 100644
--- a/board/freescale/t104xrdb/MAINTAINERS
+++ b/board/freescale/t104xrdb/MAINTAINERS
@@ -11,7 +11,7 @@ F:	configs/T1042RDB_PI_NAND_defconfig
 F:	configs/T1042RDB_PI_SPIFLASH_defconfig
 
 T1040RDB_SDCARD BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	configs/T1040RDB_SDCARD_defconfig
 F:	configs/T1042RDB_PI_SDCARD_defconfig
diff --git a/board/freescale/t208xqds/MAINTAINERS b/board/freescale/t208xqds/MAINTAINERS
index 643926f4b047611cd7cb3d2e64c20f2d4be6a8fe..deda092a6a01cc8a3a912b3d3a1bebaf8fb4998e 100644
--- a/board/freescale/t208xqds/MAINTAINERS
+++ b/board/freescale/t208xqds/MAINTAINERS
@@ -1,5 +1,5 @@
 T208XQDS BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/t208xqds/
 F:	include/configs/T208xQDS.h
diff --git a/board/freescale/t208xrdb/MAINTAINERS b/board/freescale/t208xrdb/MAINTAINERS
index 598714356c416e4ca70e6523440765c12232e448..16428798cd6ddfda330a0f08bbc89adecf83d2bd 100644
--- a/board/freescale/t208xrdb/MAINTAINERS
+++ b/board/freescale/t208xrdb/MAINTAINERS
@@ -1,5 +1,5 @@
 T208XRDB BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/t208xrdb/
 F:	include/configs/T208xRDB.h
diff --git a/board/freescale/t4qds/MAINTAINERS b/board/freescale/t4qds/MAINTAINERS
index da796bd5b6a395efa5390351aa5026f13ac1fccc..f88ee7df9e685d7d90ea5061b4352d869fea874f 100644
--- a/board/freescale/t4qds/MAINTAINERS
+++ b/board/freescale/t4qds/MAINTAINERS
@@ -1,5 +1,5 @@
 T4QDS BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/freescale/t4qds/
 F:	include/configs/T4240QDS.h
diff --git a/board/funkwerk/vovpn-gw/MAINTAINERS b/board/funkwerk/vovpn-gw/MAINTAINERS
index 9af5f7871b995f6e99e05545ded13bd1f9c0eda2..34d1cc12ff214eb7c5360c913c97dbf0382a0742 100644
--- a/board/funkwerk/vovpn-gw/MAINTAINERS
+++ b/board/funkwerk/vovpn-gw/MAINTAINERS
@@ -1,5 +1,5 @@
 VOVPN-GW BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/funkwerk/vovpn-gw/
 F:	include/configs/VoVPN-GW.h
diff --git a/board/gaisler/gr_cpci_ax2000/MAINTAINERS b/board/gaisler/gr_cpci_ax2000/MAINTAINERS
index 493c31ecabc88a9d145be6b24b31095ac08f4ed5..df55a4cc416843c64a17f621ccd4801a63bb61d6 100644
--- a/board/gaisler/gr_cpci_ax2000/MAINTAINERS
+++ b/board/gaisler/gr_cpci_ax2000/MAINTAINERS
@@ -1,5 +1,5 @@
 GR_CPCI_AX2000 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/gaisler/gr_cpci_ax2000/
 F:	include/configs/gr_cpci_ax2000.h
diff --git a/board/gaisler/gr_ep2s60/MAINTAINERS b/board/gaisler/gr_ep2s60/MAINTAINERS
index 151bef13293e4d29550ed9b116562db7e63ce8e6..7acd5f44c6fc279bb85305c63f048c54cd61535d 100644
--- a/board/gaisler/gr_ep2s60/MAINTAINERS
+++ b/board/gaisler/gr_ep2s60/MAINTAINERS
@@ -1,5 +1,5 @@
 GR_EP2S60 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/gaisler/gr_ep2s60/
 F:	include/configs/gr_ep2s60.h
diff --git a/board/gaisler/gr_xc3s_1500/MAINTAINERS b/board/gaisler/gr_xc3s_1500/MAINTAINERS
index 187f32334d49d1fd51a914da03ff46881e1c8dde..c4179d29c0ab7a9671d8d2aac40ea403f41c5a92 100644
--- a/board/gaisler/gr_xc3s_1500/MAINTAINERS
+++ b/board/gaisler/gr_xc3s_1500/MAINTAINERS
@@ -1,5 +1,5 @@
 GR_XC3S_1500 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/gaisler/gr_xc3s_1500/
 F:	include/configs/gr_xc3s_1500.h
diff --git a/board/gaisler/grsim/MAINTAINERS b/board/gaisler/grsim/MAINTAINERS
index acb863c2f7001d350e2929a4da20e6c7d4db7223..4b3312ef72851b8cef3d6166b33cf3846d920477 100644
--- a/board/gaisler/grsim/MAINTAINERS
+++ b/board/gaisler/grsim/MAINTAINERS
@@ -1,5 +1,5 @@
 GRSIM BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/gaisler/grsim/
 F:	include/configs/grsim.h
diff --git a/board/gaisler/grsim_leon2/MAINTAINERS b/board/gaisler/grsim_leon2/MAINTAINERS
index 6da9b784cf17510ee89d0336b28c14efa6b631da..bf4a95001b801d21af050d912b5f0748b5fc40df 100644
--- a/board/gaisler/grsim_leon2/MAINTAINERS
+++ b/board/gaisler/grsim_leon2/MAINTAINERS
@@ -1,5 +1,5 @@
 GRSIM_LEON2 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/gaisler/grsim_leon2/
 F:	include/configs/grsim_leon2.h
diff --git a/board/genesi/mx51_efikamx/MAINTAINERS b/board/genesi/mx51_efikamx/MAINTAINERS
index a85df77982ce7eadb08700b4e450a49dfa4a008e..f1398c49269cc71c38b9975ba5c3890a17a10dfe 100644
--- a/board/genesi/mx51_efikamx/MAINTAINERS
+++ b/board/genesi/mx51_efikamx/MAINTAINERS
@@ -1,5 +1,5 @@
 MX51_EFIKAMX BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/genesi/mx51_efikamx/
 F:	include/configs/mx51_efikamx.h
diff --git a/board/icecube/MAINTAINERS b/board/icecube/MAINTAINERS
index 02e6c049d42951316db672de0e5f2781ef95f29f..8a24eb46995ad5c577b722376fd396397a94a1da 100644
--- a/board/icecube/MAINTAINERS
+++ b/board/icecube/MAINTAINERS
@@ -6,7 +6,7 @@ F:	include/configs/IceCube.h
 F:	configs/icecube_5200_defconfig
 
 ICECUBE_5200_DDR BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	configs/icecube_5200_DDR_defconfig
 F:	configs/icecube_5200_DDR_LOWBOOT_defconfig
diff --git a/board/imx31_phycore/MAINTAINERS b/board/imx31_phycore/MAINTAINERS
index 055a847f4614a5004a7b47e36d460a4beb658110..41f6cae81b5d7f7cb4bb2aae971d7dfccb5a3cbf 100644
--- a/board/imx31_phycore/MAINTAINERS
+++ b/board/imx31_phycore/MAINTAINERS
@@ -1,5 +1,5 @@
 IMX31_PHYCORE BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/imx31_phycore/
 F:	include/configs/imx31_phycore.h
diff --git a/board/isee/igep00x0/MAINTAINERS b/board/isee/igep00x0/MAINTAINERS
index fe4a8cd445d63a49d35127b26419fe4d3f56e429..3fc2c6cb9a017df54174067476b464230f06506e 100644
--- a/board/isee/igep00x0/MAINTAINERS
+++ b/board/isee/igep00x0/MAINTAINERS
@@ -8,7 +8,7 @@ F:	configs/igep0030_defconfig
 F:	configs/igep0032_defconfig
 
 IGEP0020_NAND BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	configs/igep0020_nand_defconfig
 F:	configs/igep0030_nand_defconfig
diff --git a/board/karo/tk71/MAINTAINERS b/board/karo/tk71/MAINTAINERS
index 39b2b1db35d80164584d452b65e5a9a8e5800248..ac85d6b44c51d260972a3ad36ed37a978679420c 100644
--- a/board/karo/tk71/MAINTAINERS
+++ b/board/karo/tk71/MAINTAINERS
@@ -1,5 +1,5 @@
 TK71 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/karo/tk71/
 F:	include/configs/tk71.h
diff --git a/board/logicpd/imx31_litekit/MAINTAINERS b/board/logicpd/imx31_litekit/MAINTAINERS
index 98cc7bd15c3004955e59406af6aace21358dce73..8e3608e0af9b61c7483a6267a2a0e528cd46df62 100644
--- a/board/logicpd/imx31_litekit/MAINTAINERS
+++ b/board/logicpd/imx31_litekit/MAINTAINERS
@@ -1,5 +1,5 @@
 IMX31_LITEKIT BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/logicpd/imx31_litekit/
 F:	include/configs/imx31_litekit.h
diff --git a/board/manroland/hmi1001/MAINTAINERS b/board/manroland/hmi1001/MAINTAINERS
index bdfdc01861b2789538b78fdfe237144fb442dd6d..a66a98178c074029a69c80810b1cbd466c31aef5 100644
--- a/board/manroland/hmi1001/MAINTAINERS
+++ b/board/manroland/hmi1001/MAINTAINERS
@@ -1,5 +1,5 @@
 HMI1001 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/manroland/hmi1001/
 F:	include/configs/hmi1001.h
diff --git a/board/mcc200/MAINTAINERS b/board/mcc200/MAINTAINERS
index 3d02bc64bf5681ad8a1940baf8763adea94c7550..a59a4987957a136516178c6ae053a1c560371f0a 100644
--- a/board/mcc200/MAINTAINERS
+++ b/board/mcc200/MAINTAINERS
@@ -1,5 +1,5 @@
 MCC200 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/mcc200/
 F:	include/configs/mcc200.h
diff --git a/board/micronas/vct/MAINTAINERS b/board/micronas/vct/MAINTAINERS
index 4b825d32856c7dff7a817fca0405522a754b50dc..cbaa585134a8760732e8685c9b60332c5c79d766 100644
--- a/board/micronas/vct/MAINTAINERS
+++ b/board/micronas/vct/MAINTAINERS
@@ -1,5 +1,5 @@
 VCT BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/micronas/vct/
 F:	include/configs/vct.h
diff --git a/board/motionpro/MAINTAINERS b/board/motionpro/MAINTAINERS
index 10a97cc4ebc5130f833843342153aab24d8a7c6b..2f8b5cb580b4647f276d14c98466d73de6cbbaa7 100644
--- a/board/motionpro/MAINTAINERS
+++ b/board/motionpro/MAINTAINERS
@@ -1,5 +1,5 @@
 MOTIONPRO BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/motionpro/
 F:	include/configs/motionpro.h
diff --git a/board/mpl/pati/MAINTAINERS b/board/mpl/pati/MAINTAINERS
index f7c1bd800bd76378507d5d236de05f517642cce6..19ad05d2740671734af2cdce9df46d273f65b822 100644
--- a/board/mpl/pati/MAINTAINERS
+++ b/board/mpl/pati/MAINTAINERS
@@ -1,5 +1,5 @@
 PATI BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/mpl/pati/
 F:	include/configs/PATI.h
diff --git a/board/munices/MAINTAINERS b/board/munices/MAINTAINERS
index b8f57614bb9db80f6a534d922b27d784d0ca8ec4..50d3e7ebdaa28a534b6a05b3ea825133835a11b4 100644
--- a/board/munices/MAINTAINERS
+++ b/board/munices/MAINTAINERS
@@ -1,5 +1,5 @@
 MUNICES BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/munices/
 F:	include/configs/munices.h
diff --git a/board/mvblue/MAINTAINERS b/board/mvblue/MAINTAINERS
index a809ba5a5c0cac1358f336525bef6b9e1058bacc..5955f1a387e09382e473127c3c58845e8d6b1eb0 100644
--- a/board/mvblue/MAINTAINERS
+++ b/board/mvblue/MAINTAINERS
@@ -1,5 +1,5 @@
 MVBLUE BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/mvblue/
 F:	include/configs/MVBLUE.h
diff --git a/board/pb1x00/MAINTAINERS b/board/pb1x00/MAINTAINERS
index 6c5c2bb3646541ac2b97d506f6a2ea574858a057..8326cc78ccfa677262af05111aafbbb06eca6036 100644
--- a/board/pb1x00/MAINTAINERS
+++ b/board/pb1x00/MAINTAINERS
@@ -1,5 +1,5 @@
 PB1X00 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/pb1x00/
 F:	include/configs/pb1x00.h
diff --git a/board/pm828/MAINTAINERS b/board/pm828/MAINTAINERS
index 767a84da7a9631546a1750cae3435757409a0858..97c1ccc595b7bc908ee4ad7f79b8e16b8ae8bdcf 100644
--- a/board/pm828/MAINTAINERS
+++ b/board/pm828/MAINTAINERS
@@ -1,5 +1,5 @@
 PM828 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/pm828/
 F:	include/configs/PM828.h
diff --git a/board/ppmc7xx/MAINTAINERS b/board/ppmc7xx/MAINTAINERS
index 5b21aa70420490ef5d6db221cc01c0f2a2524534..a0c1f44e00ea62ff2d33bf6c49c0971c3f89db59 100644
--- a/board/ppmc7xx/MAINTAINERS
+++ b/board/ppmc7xx/MAINTAINERS
@@ -1,5 +1,5 @@
 PPMC7XX BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/ppmc7xx/
 F:	include/configs/ppmc7xx.h
diff --git a/board/qemu-mips/MAINTAINERS b/board/qemu-mips/MAINTAINERS
index 079949a92af026e9bc22f3cd96f359d73a987840..334f9d8ee95ae52a6dedb1460ab786d00eceaada 100644
--- a/board/qemu-mips/MAINTAINERS
+++ b/board/qemu-mips/MAINTAINERS
@@ -6,7 +6,7 @@ F:	include/configs/qemu-mips.h
 F:	configs/qemu_mips_defconfig
 
 QEMU_MIPSEL BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	configs/qemu_mipsel_defconfig
 F:	include/configs/qemu-mips64.h
diff --git a/board/renesas/MigoR/MAINTAINERS b/board/renesas/MigoR/MAINTAINERS
index 9368b0525ecb0efdd712f14a96016842fc05038e..21ee5e2754839d9a49a8dbb635ca7d4d295d4114 100644
--- a/board/renesas/MigoR/MAINTAINERS
+++ b/board/renesas/MigoR/MAINTAINERS
@@ -1,5 +1,5 @@
 MIGOR BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/renesas/MigoR/
 F:	include/configs/MigoR.h
diff --git a/board/renesas/rsk7269/MAINTAINERS b/board/renesas/rsk7269/MAINTAINERS
index d3c77c3c14083f05c58dd68dd978ef52d7dc17a4..698fbdb1df6cfb12515e2834ef030a88d8f1199e 100644
--- a/board/renesas/rsk7269/MAINTAINERS
+++ b/board/renesas/rsk7269/MAINTAINERS
@@ -1,5 +1,5 @@
 RSK7269 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/renesas/rsk7269/
 F:	include/configs/rsk7269.h
diff --git a/board/renesas/sh7752evb/MAINTAINERS b/board/renesas/sh7752evb/MAINTAINERS
index 89106690020f6c7190de99bd3f9e0a98956e6a8c..9840477d7dd2a7ee06eaa017cc7aee69d9b9af9a 100644
--- a/board/renesas/sh7752evb/MAINTAINERS
+++ b/board/renesas/sh7752evb/MAINTAINERS
@@ -1,5 +1,5 @@
 SH7752EVB BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/renesas/sh7752evb/
 F:	include/configs/sh7752evb.h
diff --git a/board/renesas/sh7753evb/MAINTAINERS b/board/renesas/sh7753evb/MAINTAINERS
index 03e6c8cdc4e563757164b1d92b8b39359896613a..b6c85eedab75f2c449501f72a21bee66d61be4ac 100644
--- a/board/renesas/sh7753evb/MAINTAINERS
+++ b/board/renesas/sh7753evb/MAINTAINERS
@@ -1,5 +1,5 @@
 SH7753EVB BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/renesas/sh7753evb/
 F:	include/configs/sh7753evb.h
diff --git a/board/renesas/sh7757lcr/MAINTAINERS b/board/renesas/sh7757lcr/MAINTAINERS
index bbdd6d081281869be0721ae3c28945885d0af898..20aca678a672adb91c664b769b01c3e4036ad140 100644
--- a/board/renesas/sh7757lcr/MAINTAINERS
+++ b/board/renesas/sh7757lcr/MAINTAINERS
@@ -1,5 +1,5 @@
 SH7757LCR BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/renesas/sh7757lcr/
 F:	include/configs/sh7757lcr.h
diff --git a/board/renesas/sh7785lcr/MAINTAINERS b/board/renesas/sh7785lcr/MAINTAINERS
index 0d99de68d7508d0c4fc95f17addd9948663acfb0..17578e036a51d192d4eadc6a566ce1cece36b214 100644
--- a/board/renesas/sh7785lcr/MAINTAINERS
+++ b/board/renesas/sh7785lcr/MAINTAINERS
@@ -1,5 +1,5 @@
 SH7785LCR BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/renesas/sh7785lcr/
 F:	include/configs/sh7785lcr.h
diff --git a/board/sbc405/MAINTAINERS b/board/sbc405/MAINTAINERS
index dbb4451cebfdaa1f684a2a2b43eb12d3f3c80a8f..2abad25997c0aaebdf1c59145f3f5a1286e95af3 100644
--- a/board/sbc405/MAINTAINERS
+++ b/board/sbc405/MAINTAINERS
@@ -1,5 +1,5 @@
 SBC405 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/sbc405/
 F:	include/configs/sbc405.h
diff --git a/board/socrates/MAINTAINERS b/board/socrates/MAINTAINERS
index fc3e11dff0c5da15bb16c2071acc2327dd92d4de..293b8e6d018b0866ecc510c9d19829935353c2e3 100644
--- a/board/socrates/MAINTAINERS
+++ b/board/socrates/MAINTAINERS
@@ -1,5 +1,5 @@
 SOCRATES BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/socrates/
 F:	include/configs/socrates.h
diff --git a/board/spear/spear300/MAINTAINERS b/board/spear/spear300/MAINTAINERS
index 15164fe3a3d318ab34a104ca837868ee67f16448..07152aefbab09347f206eafa578f52269ba984ad 100644
--- a/board/spear/spear300/MAINTAINERS
+++ b/board/spear/spear300/MAINTAINERS
@@ -6,7 +6,7 @@ F:	include/configs/spear3xx_evb.h
 F:	configs/spear300_defconfig
 
 SPEAR300_NAND BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	configs/spear300_nand_defconfig
 F:	configs/spear300_usbtty_defconfig
diff --git a/board/spear/spear310/MAINTAINERS b/board/spear/spear310/MAINTAINERS
index 3a7e610cb580fecdee6e7f95da88bcfc13bd33f6..4f9aa15b83b8f4719af7cbdc80a0d961ed934d9a 100644
--- a/board/spear/spear310/MAINTAINERS
+++ b/board/spear/spear310/MAINTAINERS
@@ -6,7 +6,7 @@ F:	include/configs/spear3xx_evb.h
 F:	configs/spear310_defconfig
 
 SPEAR310_NAND BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	configs/spear310_nand_defconfig
 F:	configs/spear310_pnor_defconfig
diff --git a/board/spear/spear320/MAINTAINERS b/board/spear/spear320/MAINTAINERS
index 414becacc1844f58e53fe7cf3e7b4e10f7ff8057..bf7809230f78109460427e02e83247bcf4e512f8 100644
--- a/board/spear/spear320/MAINTAINERS
+++ b/board/spear/spear320/MAINTAINERS
@@ -6,7 +6,7 @@ F:	include/configs/spear3xx_evb.h
 F:	configs/spear320_defconfig
 
 SPEAR320_NAND BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	configs/spear320_nand_defconfig
 F:	configs/spear320_pnor_defconfig
diff --git a/board/spear/spear600/MAINTAINERS b/board/spear/spear600/MAINTAINERS
index a978fdd9f742793439cbd963f482948174381326..ddcd11a873cdec51ebe6de642ce40d6d53fb629b 100644
--- a/board/spear/spear600/MAINTAINERS
+++ b/board/spear/spear600/MAINTAINERS
@@ -6,7 +6,7 @@ F:	include/configs/spear6xx_evb.h
 F:	configs/spear600_defconfig
 
 SPEAR600_NAND BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	configs/spear600_nand_defconfig
 F:	configs/spear600_usbtty_defconfig
diff --git a/board/st-ericsson/u8500/MAINTAINERS b/board/st-ericsson/u8500/MAINTAINERS
index 54e7921ae19d457e416b3ee09b6a839c50194529..e2581eb2e4b1f6b20c40e7086fb314731804c04a 100644
--- a/board/st-ericsson/u8500/MAINTAINERS
+++ b/board/st-ericsson/u8500/MAINTAINERS
@@ -1,5 +1,5 @@
 U8500 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/st-ericsson/u8500/
 F:	include/configs/u8500_href.h
diff --git a/board/ti/evm/MAINTAINERS b/board/ti/evm/MAINTAINERS
index b2ebadcb40591a7c5a63a7d36e19663add17ffe5..d0b27882bc2197c4b0539a867287d68ca8b88a8f 100644
--- a/board/ti/evm/MAINTAINERS
+++ b/board/ti/evm/MAINTAINERS
@@ -6,7 +6,7 @@ F:	include/configs/omap3_evm.h
 F:	configs/omap3_evm_defconfig
 
 OMAP3_EVM_QUICK_MMC BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	include/configs/omap3_evm_quick_mmc.h
 F:	configs/omap3_evm_quick_mmc_defconfig
diff --git a/board/ti/ti816x/MAINTAINERS b/board/ti/ti816x/MAINTAINERS
index 8bf612290820b6499f0b2b0d5be8060a6ce371a5..d3de144bc2152d57afdc5a53f81f77d603cfcb4d 100644
--- a/board/ti/ti816x/MAINTAINERS
+++ b/board/ti/ti816x/MAINTAINERS
@@ -1,5 +1,5 @@
 TI816X BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/ti/ti816x/
 F:	include/configs/ti816x_evm.h
diff --git a/board/total5200/MAINTAINERS b/board/total5200/MAINTAINERS
index 983b96d12c3485ddb4d3d51f898a3782c4a2ffe1..afb0058d087b16d04895d4bd3a8441cba22508dd 100644
--- a/board/total5200/MAINTAINERS
+++ b/board/total5200/MAINTAINERS
@@ -1,5 +1,5 @@
 TOTAL5200 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/total5200/
 F:	include/configs/Total5200.h
diff --git a/board/tqc/tqm5200/MAINTAINERS b/board/tqc/tqm5200/MAINTAINERS
index 581ef954532ea9a4721a84feeb754cef5067ea12..d3eb543140a9347e5c624c4273034988e2b2223a 100644
--- a/board/tqc/tqm5200/MAINTAINERS
+++ b/board/tqc/tqm5200/MAINTAINERS
@@ -1,5 +1,5 @@
 TQM5200 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/tqc/tqm5200/
 F:	include/configs/aev.h
diff --git a/board/tqc/tqm8272/MAINTAINERS b/board/tqc/tqm8272/MAINTAINERS
index a660de19bc5d2c1252a6bfae39a5a09fddc955d0..988d2b189bc15031654ee87123ca08b88cadfa4e 100644
--- a/board/tqc/tqm8272/MAINTAINERS
+++ b/board/tqc/tqm8272/MAINTAINERS
@@ -1,5 +1,5 @@
 TQM8272 BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/tqc/tqm8272/
 F:	include/configs/TQM8272.h
diff --git a/board/tqc/tqm834x/MAINTAINERS b/board/tqc/tqm834x/MAINTAINERS
index 10c14f3e0b699fb393f54fd170ddb4573e6f4873..543ab1b5528359d2b98c32aae0d72ad0e126fcac 100644
--- a/board/tqc/tqm834x/MAINTAINERS
+++ b/board/tqc/tqm834x/MAINTAINERS
@@ -1,5 +1,5 @@
 TQM834X BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/tqc/tqm834x/
 F:	include/configs/TQM834x.h
diff --git a/board/tqc/tqm8xx/MAINTAINERS b/board/tqc/tqm8xx/MAINTAINERS
index 161fa68e5b62e0badd939c3e4b8859555045f803..fe4a21202925c422311fa45c0c6e9e7f3e87fed3 100644
--- a/board/tqc/tqm8xx/MAINTAINERS
+++ b/board/tqc/tqm8xx/MAINTAINERS
@@ -39,7 +39,7 @@ F:	configs/virtlab2_defconfig
 F:	configs/wtk_defconfig
 
 NSCU BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	include/configs/NSCU.h
 F:	configs/NSCU_defconfig
diff --git a/board/v38b/MAINTAINERS b/board/v38b/MAINTAINERS
index 1b12d0bdad85a6c2f1864cecbca78815660cf66a..d1a6ae6b2f72b51b13ad27cabf863319234f1f3a 100644
--- a/board/v38b/MAINTAINERS
+++ b/board/v38b/MAINTAINERS
@@ -1,5 +1,5 @@
 V38B BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/v38b/
 F:	include/configs/v38b.h
diff --git a/board/woodburn/MAINTAINERS b/board/woodburn/MAINTAINERS
index 715f2caa116c30e32a04842bdacd58a584db57a1..4fbf6bb88b0d80fc1fb2026966b183fcbc38c7c5 100644
--- a/board/woodburn/MAINTAINERS
+++ b/board/woodburn/MAINTAINERS
@@ -6,7 +6,7 @@ F:	include/configs/woodburn.h
 F:	configs/woodburn_defconfig
 
 WOODBURN_SD BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	include/configs/woodburn_sd.h
 F:	configs/woodburn_sd_defconfig
diff --git a/board/xaeniax/MAINTAINERS b/board/xaeniax/MAINTAINERS
index f2fa4bf905092b2619d6c826dbdc6674a718ce8b..44bb5883f20a40e2e22867d36a85250632da4acd 100644
--- a/board/xaeniax/MAINTAINERS
+++ b/board/xaeniax/MAINTAINERS
@@ -1,5 +1,5 @@
 XAENIAX BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/xaeniax/
 F:	include/configs/xaeniax.h
diff --git a/board/xes/xpedite517x/MAINTAINERS b/board/xes/xpedite517x/MAINTAINERS
index c74fdf48740158545601e01bcb3263dcf64b875b..035cb1499add040467435ce63e4ffaeb777f56d4 100644
--- a/board/xes/xpedite517x/MAINTAINERS
+++ b/board/xes/xpedite517x/MAINTAINERS
@@ -1,5 +1,5 @@
 XPEDITE517X BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/xes/xpedite517x/
 F:	include/configs/xpedite517x.h
diff --git a/board/xes/xpedite520x/MAINTAINERS b/board/xes/xpedite520x/MAINTAINERS
index 7f9bf9ae76cf34338bf0958a598e5d2ae9f21c8f..2fd4ac072d54ae50aab55814f0941979da452c3d 100644
--- a/board/xes/xpedite520x/MAINTAINERS
+++ b/board/xes/xpedite520x/MAINTAINERS
@@ -1,5 +1,5 @@
 XPEDITE520X BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/xes/xpedite520x/
 F:	include/configs/xpedite520x.h
diff --git a/board/xes/xpedite537x/MAINTAINERS b/board/xes/xpedite537x/MAINTAINERS
index a13dcf196cf5c14198c2dbd4b1d07e3a99d0030a..45a420d11ab6da5bf6952cb76526c367fe0899e4 100644
--- a/board/xes/xpedite537x/MAINTAINERS
+++ b/board/xes/xpedite537x/MAINTAINERS
@@ -1,5 +1,5 @@
 XPEDITE537X BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/xes/xpedite537x/
 F:	include/configs/xpedite537x.h
diff --git a/board/xes/xpedite550x/MAINTAINERS b/board/xes/xpedite550x/MAINTAINERS
index 12d321eddd8624a5d954841c891a00a8a89423f3..b22f0e61738cb0dbc3528f8a3ca87efc9670e2bb 100644
--- a/board/xes/xpedite550x/MAINTAINERS
+++ b/board/xes/xpedite550x/MAINTAINERS
@@ -1,5 +1,5 @@
 XPEDITE550X BOARD
-M:	-
+#M:	-
 S:	Maintained
 F:	board/xes/xpedite550x/
 F:	include/configs/xpedite550x.h