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: (51 commits)
  sk98lin: mark deprecated in Kconfig
  Hostess SV-11 depends on INET
  Fix link autonegotiation timer.
  sk98lin: planned removal
  B44: increase wait loop
  b44: replace define
  e1000: allow ethtool to see link status when down
  e1000: remove obsolete custom pci_save_state code
  e1000: fix shared interrupt warning message
  atm: Use ARRAY_SIZE macro when appropriate
  bugfixes and new hardware support for arcnet driver
  pcnet32 NAPI no longer experimental
  MAINTAINER
  macb: Remove inappropriate spinlocks around mii calls
  Convert meth to netdev_priv
  sky2: v1.13
  sky2: receive error handling improvements
  sky2: transmit timeout
  sky2: flow control negotiation for Yukon-FE
  sky2: no need to reset pause bits on shutdown
  ...

diff --combined MAINTAINERS
index a384551a597810724237d097cc622a9f3a14ecb7,c0f9a1ad361ef017936cdecaedd9f4a32b61af50..270c6b006b91560fad13afe140ed5aabfdcacd76
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -247,13 -247,6 +247,13 @@@ L:       linux-acpi@vger.kernel.or
  W:    http://acpi.sourceforge.net/
  S:    Supported
  
 +ACPI VIDEO DRIVER
 +P:    Luming Yu
 +M:    luming.yu@intel.com
 +L:    linux-acpi@vger.kernel.org
 +W:    http://acpi.sourceforge.net/
 +S:    Supported
 +
  AD1816 SOUND DRIVER
  P:    Thorsten Knabe
  M:    Thorsten Knabe <linux@thorsten-knabe.de>
@@@ -2630,8 -2623,8 +2630,8 @@@ T:      git kernel.org:/pub/scm/linux/kernel
  S:    Maintained
  
  PCNET32 NETWORK DRIVER
- P:    Thomas Bogendörfer
- M:    tsbogend@alpha.franken.de
+ P:    Don Fry
+ M:    pcnet32@verizon.net
  L:    netdev@vger.kernel.org
  S:    Maintained
  
@@@ -3068,8 -3061,6 +3068,8 @@@ S:      Maintaine
  SONY VAIO CONTROL DEVICE DRIVER
  P:    Stelian Pop
  M:    stelian@popies.net
 +P:    Mattia Dongili
 +M:    malattia@linux.it
  W:    http://popies.net/sonypi/
  S:    Maintained