sky2: GMAC pause frame

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 1b5430a49fdd0dc39fac28f385628f7e14ba8e8d..5305dd69095b3b5e7605c6dd3539168d43cc4e77 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1998,6 +1998,13 @@ M:       rubini@ipvvis.unipv.it
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 
+MSI LAPTOP SUPPORT
+P:     Lennart Poettering
+M:     mzxreary@0pointer.de
+L:     https://tango.0pointer.de/mailman/listinfo/s270-linux
+W:     http://0pointer.de/lennart/tchibo.html
+S:     Maintained
+
 MTRR AND SIMILAR SUPPORT [i386]
 P:     Richard Gooch
 M:     rgooch@atnf.csiro.au
@@ -2005,8 +2012,11 @@ L:       linux-kernel@vger.kernel.org
 W:     http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html
 S:     Maintained
 
-MULTIMEDIA CARD (MMC) SUBSYSTEM
-S:     Orphan
+MULTIMEDIA CARD (MMC) AND SECURE DIGITAL (SD) SUBSYSTEM
+P:     Pierre Ossman
+M:     drzeus-mmc@drzeus.cx
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
 
 MULTISOUND SOUND DRIVER
 P:     Andrew Veliath
@@ -2042,11 +2052,13 @@ P:      Marc Boucher
 P:     James Morris
 P:     Harald Welte
 P:     Jozsef Kadlecsik
-M:     coreteam@netfilter.org
+P:     Patrick McHardy
+M:     kaber@trash.net
+L:     netfilter-devel@lists.netfilter.org
+L:     netfilter@lists.netfilter.org
+L:     coreteam@netfilter.org
 W:     http://www.netfilter.org/
 W:     http://www.iptables.org/
-L:     netfilter@lists.netfilter.org
-L:     netfilter-devel@lists.netfilter.org
 S:     Supported
 
 NETLABEL