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

diff --combined MAINTAINERS
index 4add2f2895913b5297f6a9e07c043a883b126a4b,19a9a1c530371a9328af010d96d2544e88289378..f317cb42952f017755b9ef7517c6e09f35f4e2a9
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -512,11 -512,11 +512,11 @@@ W:      http://linuxppc64.or
  S:    Supported
  
  BTTV VIDEO4LINUX DRIVER
- P:    Gerd Knorr
- M:    kraxel@bytesex.org
+ P:    Mauro Carvalho Chehab
+ M:    mchehab@brturbo.com.br
  L:    video4linux-list@redhat.com
- W:    http://bytesex.org/bttv/
- S:    Orphan
+ W:    http://linuxtv.org
+ S:    Maintained
  
  BUSLOGIC SCSI DRIVER
  P:    Leonard N. Zubkoff
@@@ -987,13 -987,6 +987,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
@@@ -2632,10 -2625,11 +2632,11 @@@ W:   http://rio500.sourceforge.ne
  S:    Maintained
  
  VIDEO FOR LINUX
- P:    Gerd Knorr
- M:    kraxel@bytesex.org
+ P:    Mauro Carvalho Chehab
+ M:    mchehab@brturbo.com.br
  L:    video4linux-list@redhat.com
- S:    Orphan
+ W:    http://linuxtv.org
+ S:    Maintained
  
  W1 DALLAS'S 1-WIRE BUS
  P:    Evgeniy Polyakov