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:
  NET: add MAINTAINERS entry for ucc_geth driver
  myri10ge: report link up/down in standard ethtool way
  NetXen: Removal of extra free_irq call
  Update tulip maintainer email address
  smc91x: sh solution engine fixes.
  e1000: disable polling before registering netdevice
  network drivers: eliminate unneeded kill_vid code
  atl1: eliminate unneeded kill_vid code
  8139cp: fix VLAN unregistration
  sky2: Fix VLAN unregistration
  VLAN: kill_vid is only useful for VLAN filtering devices
  qla3xxx: device doesnt do hardware checksumming.

1 files changed, 8 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 124b9508ae2e..f3b5a391e074 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1487,6 +1487,13 @@ L:	linux-usb-devel@lists.sourceforge.net
 L:      linuxppc-embedded@ozlabs.org
 S:      Maintained
 
+FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
+P:      Li Yang
+M:      leoli@freescale.com
+L:      netdev@vger.kernel.org
+L:      linuxppc-embedded@ozlabs.org
+S:      Maintained
+
 FILE LOCKING (flock() and fcntl()/lockf())
 P:      Matthew Wilcox
 M:      matthew@wil.cx
@@ -3545,7 +3552,7 @@ S:	Maintained
 
 TULIP NETWORK DRIVER
 P:      Valerie Henson
-M:      val_henson@linux.intel.com
+M:      val@nmt.edu
 L:      tulip-users@lists.sourceforge.net
 W:      http://sourceforge.net/projects/tulip/
 S:      Maintained