Merge branch 'master' into upstream
[sfrench/cifs-2.6.git] / MAINTAINERS
index 767a43434ae80fa6940c36b6cf6799dddb85270c..63673e6513b717994de75ffb552f546f3c140ab8 100644 (file)
@@ -2679,7 +2679,6 @@ M:        josejx@gentoo.org
 P:     Daniel Drake
 M:     dsd@gentoo.org
 W:     http://softmac.sipsolutions.net/
-L:     softmac-dev@sipsolutions.net
 L:     netdev@vger.kernel.org
 S:     Maintained