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: (116 commits)
  sk98lin: planned removal
  AT91: MACB support
  sky2: version 1.12
  sky2: add new chip ids
  sky2: Yukon Extreme support
  sky2: safer transmit timeout
  sky2: TSO support for EC_U
  sky2: use dev_err for error reports
  sky2: add Wake On Lan support
  fix unaligned exception in /drivers/net/wireless/orinoco.c
  Remove unused kernel config option DLCI_COUNT
  z85230: spinlock logic
  mips: declance: Driver model for the PMAD-A
  Spidernet: Rework RX linked list
  NET: turn local_save_flags() + local_irq_disable() into local_irq_save()
  NET-3c59x: turn local_save_flags() + local_irq_disable() into local_irq_save()
  hp100: convert pci_module_init() to pci_register_driver()
  NetXen: Added ethtool support for user level tools.
  NetXen: Firmware crb init changes.
  maintainers: add atl1 maintainers
  ...

1 files changed, 17 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 96135d285eb0..fe35f3ac4cd3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -598,6 +598,16 @@ M:	ecashin@coraid.com
 W:      http://www.coraid.com/support/linux
 S:      Supported
 
+ATL1 ETHERNET DRIVER
+P:      Jay Cliburn
+M:      jcliburn@gmail.com
+P:      Chris Snook
+M:      csnook@redhat.com
+L:      atl1-devel@lists.sourceforge.net
+W:      http://sourceforge.net/projects/atl1
+W:      http://atl1.sourceforge.net
+S:      Maintained
+
 ATM
 P:      Chas Williams
 M:      chas@cmf.nrl.navy.mil
@@ -2485,6 +2495,12 @@ L:	orinoco-devel@lists.sourceforge.net
 W:      http://www.nongnu.org/orinoco/
 S:      Maintained
 
+PA SEMI ETHERNET DRIVER
+P:      Olof Johansson
+M:      olof@lixom.net
+L:      netdev@vger.kernel.org
+S:      Maintained
+
 PARALLEL PORT SUPPORT
 P:      Phil Blundell
 M:      philb@gnu.org
@@ -2654,7 +2670,7 @@ S:	Supported
 
 PRISM54 WIRELESS DRIVER
 P:      Prism54 Development Team
-M:      prism54-private@prism54.org
+M:      developers@islsm.org
 L:      netdev@vger.kernel.org
 W:      http://prism54.org
 S:      Maintained