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

diff --combined MAINTAINERS
index 4b390695888b7b26f512f3887cb67b92b0984796,3b38d6ab06cfc8b846758ee6f555d64e71fd0414..473a08a9cc3ddcabc6769d3586021514747ea3e3
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -784,7 -784,7 +784,7 @@@ DVB SUBSYSTEM AND DRIVER
  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
@@@ -991,13 -991,6 +991,13 @@@ M:       mike.miller@hp.co
  L:    iss_storagedev@hp.com
  S:    Supported
   
 +HOST AP DRIVER
 +P:    Jouni Malinen
 +M:    jkmaline@cc.hut.fi
 +L:    hostap@shmoo.com
 +W:    http://hostap.epitest.fi/
 +S:    Maintained
 +
  HP100:        Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series
  P:    Jaroslav Kysela
  M:    perex@suse.cz
@@@ -1528,6 -1521,12 +1528,12 @@@ P:    Zach Brow
  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 -1658,7 +1665,7 @@@ M:      kuznet@ms2.inr.ac.r
  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 -2047,7 +2054,7 @@@ SELINUX SECURITY MODUL
  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