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

* '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
  ...

1 files changed, 2 insertions, 29 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 05504f2ff110..76b857157866 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -136,17 +136,6 @@ M:	ajk@iehk.rwth-aachen.de
 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
@@ -1043,12 +1032,6 @@ M:	kernel@wantstofly.org
 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 +1952,6 @@ M:	adaplas@gmail.com
 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 +2678,6 @@ M:	Paul.Clements@steeleye.com
 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 +3229,8 @@ S:	Supported
 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 +4086,6 @@ M:	hirofumi@mail.parknet.co.jp
 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