1 files changed, 20 insertions, 5 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 3ceeb56fe019..4a26f832b4b5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2129,8 +2129,8 @@ S:	Maintained
 JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
 P:      David Woodhouse
 M:      dwmw2@infradead.org
-L:      jffs-dev@axis.com
-W:      http://sources.redhat.com/jffs2/
+L:      linux-mtd@lists.infradead.org
+W:      http://www.linux-mtd.infradead.org/doc/jffs2.html
 S:      Maintained
 
 JFS FILESYSTEM
@@ -2259,6 +2259,13 @@ L:	legousb-devel@lists.sourceforge.net
 W:      http://legousb.sourceforge.net/
 S:      Maintained
 
+LGUEST
+P:      Rusty Russell
+M:      rusty@rustcorp.com.au
+L:      lguest@ozlabs.org
+W:      http://lguest.ozlabs.org/
+S:      Maintained
+
 LINUX FOR IBM pSERIES (RS/6000)
 P:      Paul Mackerras
 M:      paulus@au.ibm.com
@@ -2442,13 +2449,15 @@ W:	http://www.tazenda.demon.co.uk/phil/linux-hp
 S:      Maintained
 
 MAC80211
-P:      Jiri Benc
-M:      jbenc@suse.cz
 P:      Michael Wu
 M:      flamingice@sourmilk.net
+P:      Johannes Berg
+M:      johannes@sipsolutions.net
+P:      Jiri Benc
+M:      jbenc@suse.cz
 L:      linux-wireless@vger.kernel.org
 W:      http://linuxwireless.org/
-T:      git kernel.org:/pub/scm/linux/kernel/git/jbenc/mac80211.git
+T:      git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 S:      Maintained
 
 MACVLAN DRIVER
@@ -4143,6 +4152,12 @@ W:	http://linuxtv.org
 T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
 S:      Maintained
 
+VLAN (802.1Q)
+P:      Patrick McHardy
+M:      kaber@trash.net
+L:      netdev@vger.kernel.org
+S:      Maintained
+
 VT1211 HARDWARE MONITOR DRIVER
 P:      Juerg Haefliger
 M:      juergh@gmail.com