Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (39 commits)
  Remove Andrew Morton from list of net driver maintainers.
  bonding: Acquire correct locks in alb for promisc change
  bonding: Convert more locks to _bh, acquire rtnl, for new locking
  bonding: Convert locks to _bh, rework alb locking for new locking
  bonding: Convert miimon to new locking
  bonding: Convert balance-rr transmit to new locking
  Convert bonding timers to workqueues
  Update MAINTAINERS to reflect my (jgarzik's) current efforts.
  pasemi_mac: fix typo
  defxx.c: dfx_bus_init() is __devexit not __devinit
  s390 MAINTAINERS
  remove header_ops bug in qeth driver
  sky2: crash on remove
  MIPSnet: Delete all the useless debugging printks.
  AR7 ethernet: small post-merge cleanups and fixes
  mv643xx_eth: Hook up mv643xx_get_sset_count
  mv643xx_eth: Remove obsolete checksum offload comment
  mv643xx_eth: Merge drivers/net/mv643xx_eth.h into mv643xx_eth.c
  mv643xx_eth: Remove unused register defines
  mv643xx_eth: Clean up mv643xx_eth.h
  ...

diff --combined MAINTAINERS
index 05504f2ff110a5d9d426f8872a911f23b815d43d,9d0ae8d2915fe1eed6f19d1f574fbb3c7f9cd30f..76b8571578669567b9e71ac4c9615c3c9b8f7457
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -136,17 -136,6 +136,6 @@@ M:        ajk@iehk.rwth-aachen.d
  L:    linux-hams@vger.kernel.org
  S:    Maintained
  
- 8139CP 10/100 FAST ETHERNET DRIVER
- P:    Jeff Garzik
- M:    jgarzik@pobox.com
- S:    Maintained
- 
- 8139TOO 10/100 FAST ETHERNET DRIVER
- P:    Jeff Garzik
- M:    jgarzik@pobox.com
- W:    http://sourceforge.net/projects/gkernel/
- S:    Maintained
- 
  8169 10/100/1000 GIGABIT ETHERNET DRIVER
  P:    Francois Romieu
  M:    romieu@fr.zoreil.com
@@@ -325,12 -314,6 +314,12 @@@ M:       Juergen Fischer <fischer@norbit.de
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
  
 +AIC7XXX / AIC79XX SCSI DRIVER
 +P:    Hannes Reinecke
 +M:    hare@suse.de
 +L:    linux-scsi@vger.kernel.org
 +S:    Maintained
 +
  ALCATEL SPEEDTOUCH USB DRIVER
  P:    Duncan Sands
  M:    duncan.sands@free.fr
@@@ -1043,12 -1026,6 +1032,6 @@@ M:     kernel@wantstofly.or
  L:    netdev@vger.kernel.org
  S:    Maintained
  
- CIRRUS LOGIC GENERIC FBDEV DRIVER
- P:    Jeff Garzik
- M:    jgarzik@pobox.com
- L:    linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
- S:    Odd Fixes
- 
  CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER
  P:    Lennert Buytenhek
  M:    kernel@wantstofly.org
@@@ -1969,12 -1946,6 +1952,6 @@@ M:     adaplas@gmail.co
  L:    linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
  S:    Maintained
  
- INTEL I8XX RANDOM NUMBER GENERATOR SUPPORT
- P:    Jeff Garzik
- M:    jgarzik@pobox.com
- W:    http://sourceforge.net/projects/gkernel/
- S:    Maintained
- 
  INTEL IA32 MICROCODE UPDATE SUPPORT
  P:    Tigran Aivazian
  M:    tigran@aivazian.fsnet.co.uk
@@@ -2701,8 -2672,6 +2678,6 @@@ M:      Paul.Clements@steeleye.co
  S:    Maintained
  
  NETWORK DEVICE DRIVERS
- P:    Andrew Morton
- M:    akpm@linux-foundation.org
  P:    Jeff Garzik
  M:    jgarzik@pobox.com
  L:    netdev@vger.kernel.org
@@@ -3254,6 -3223,8 +3229,8 @@@ S:      Supporte
  S390 NETWORK DRIVERS
  P:    Ursula Braun
  M:    ubraun@linux.vnet.ibm.com
+ P:    Frank Blaschka
+ M:    blaschka@linux.vnet.ibm.com
  M:    linux390@de.ibm.com
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -4109,10 -4080,6 +4086,6 @@@ M:     hirofumi@mail.parknet.co.j
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
- VIA 82Cxxx AUDIO DRIVER (old OSS driver)
- P:    Jeff Garzik
- S:    Odd fixes
- 
  VIA RHINE NETWORK DRIVER
  P:    Roger Luethi
  M:    rl@hellgate.ch