/spare/repo/netdev-2.6 branch 'ieee80211'

1 files changed, 9 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 4b390695888..473a08a9cc3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -784,7 +784,7 @@ DVB SUBSYSTEM AND DRIVERS
 P:      LinuxTV.org Project
 M:      linux-dvb-maintainer@linuxtv.org
 L:      linux-dvb@linuxtv.org (subscription required)
-W:      http://linuxtv.org/developer/dvb.xml
+W:      http://linuxtv.org/
 S:      Supported
 
 EATA-DMA SCSI DRIVER
@@ -1528,6 +1528,12 @@ P:	Zach Brown
 M:      zab@zabbo.net
 S:      Odd Fixes
 
+MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
+P: Michael Kerrisk
+M: mtk-manpages@gmx.net
+W: ftp://ftp.kernel.org/pub/linux/docs/manpages
+S: Maintained
+
 MARVELL MV64340 ETHERNET DRIVER
 P:      Manish Lachwani
 M:      Manish_Lachwani@pmc-sierra.com
@@ -1659,7 +1665,7 @@ M:	kuznet@ms2.inr.ac.ru
 P:      Pekka Savola (ipv6)
 M:      pekkas@netcore.fi
 P:      James Morris
-M:      jmorris@redhat.com
+M:      jmorris@namei.org
 P:      Hideaki YOSHIFUJI
 M:      yoshfuji@linux-ipv6.org
 P:      Patrick McHardy
@@ -2048,7 +2054,7 @@ SELINUX SECURITY MODULE
 P:      Stephen Smalley
 M:      sds@epoch.ncsc.mil
 P:      James Morris
-M:      jmorris@redhat.com
+M:      jmorris@namei.org
 L:      linux-kernel@vger.kernel.org (kernel issues)
 L:      selinux@tycho.nsa.gov (general discussion)
 W:      http://www.nsa.gov/selinux