Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (64 commits)
  phylib: Fix delay argument of schedule_delayed_work
  NET/ixgbe: Fix powering off during shutdown
  NET/e1000e: Fix powering off during shutdown
  NET/e1000: Fix powering off during shutdown
  packet: avoid warnings when high-order page allocation fails
  gianfar: stop send queue before resetting gianfar
  myr10ge: again fix lro_gen_skb() alignment
  declance: convert to net_device_ops
  bfin_mac: convert to net_device_ops
  au1000: convert to net_device_ops
  atarilance: convert to net_device_ops
  a2065: convert to net_device_ops
  ixgbe: update real_num_tx_queues on changing num_rx_queues
  ixgbe: fix tx queue index
  Revert "rose: zero length frame filtering in af_rose.c"
  sfc: Use correct macro to set event bitfield
  sfc: Match calls to netif_napi_add() and netif_napi_del()
  bonding: Remove debug printk
  e1000/e1000: fix compile warning
  ehea: Fix incomplete conversion to net_device_ops
  ...

diff --combined MAINTAINERS
index 0cb20d8216945751a3a232d2b15ec72f29470e16,abedca58d8bd31b596eb8dc0736428982820a4c3..abbedb658c29778576b693fb26dfb40c78b13067
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -461,7 -461,7 +461,7 @@@ F: arch/x86/include/asm/amd_iommu*.
  
  AMD MICROCODE UPDATE SUPPORT
  P:    Andreas Herrmann
 -M:    andeas.herrmann3@amd.com
 +M:    andreas.herrmann3@amd.com
  L:    amd64-microcode@amd64.org
  S:    Supported
  F:    arch/x86/kernel/microcode_amd.c
@@@ -1894,7 -1894,7 +1894,7 @@@ F:      fs/ecryptfs
  EDAC-CORE
  P:    Doug Thompson
  M:    dougthompson@xmission.com
 -L:    bluesmoke-devel@lists.sourceforge.net
 +L:    bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
  W:    bluesmoke.sourceforge.net
  S:    Supported
  F:    Documentation/edac.txt
@@@ -1906,7 -1906,7 +1906,7 @@@ P:      Mark Gros
  P:    Doug Thompson
  M:    mark.gross@intel.com
  M:    dougthompson@xmission.com
 -L:    bluesmoke-devel@lists.sourceforge.net
 +L:    bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
  W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/e752x_edac.c
@@@ -1914,7 -1914,7 +1914,7 @@@
  EDAC-E7XXX
  P:    Doug Thompson
  M:    dougthompson@xmission.com
 -L:    bluesmoke-devel@lists.sourceforge.net
 +L:    bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
  W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/e7xxx_edac.c
@@@ -1922,7 -1922,7 +1922,7 @@@
  EDAC-I82443BXGX
  P:    Tim Small
  M:    tim@buttersideup.com
 -L:    bluesmoke-devel@lists.sourceforge.net
 +L:    bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
  W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i82443bxgx_edac.c
@@@ -1930,7 -1930,7 +1930,7 @@@
  EDAC-I3000
  P:    Jason Uhlenkott
  M:    juhlenko@akamai.com
 -L:    bluesmoke-devel@lists.sourceforge.net
 +L:    bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
  W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i3000_edac.c
@@@ -1938,7 -1938,7 +1938,7 @@@
  EDAC-I5000
  P:    Doug Thompson
  M:    dougthompson@xmission.com
 -L:    bluesmoke-devel@lists.sourceforge.net
 +L:    bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
  W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i5000_edac.c
@@@ -1946,7 -1946,7 +1946,7 @@@
  EDAC-I5400
  P:    Mauro Carvalho Chehab
  M:    mchehab@redhat.com
 -L:    bluesmoke-devel@lists.sourceforge.net
 +L:    bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
  W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i5400_edac.c
@@@ -1956,7 -1956,7 +1956,7 @@@ P:      Ranganathan Desika
  P:    Arvind R.
  M:    rdesikan@jetzbroadband.com
  M:    arvind@acarlab.com
 -L:    bluesmoke-devel@lists.sourceforge.net
 +L:    bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
  W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i82975x_edac.c
@@@ -1964,7 -1964,7 +1964,7 @@@
  EDAC-PASEMI
  P:    Egor Martovetsky
  M:    egor@pasemi.com
 -L:    bluesmoke-devel@lists.sourceforge.net
 +L:    bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
  W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/pasemi_edac.c
@@@ -1972,7 -1972,7 +1972,7 @@@
  EDAC-R82600
  P:    Tim Small
  M:    tim@buttersideup.com
 -L:    bluesmoke-devel@lists.sourceforge.net
 +L:    bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
  W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/r82600_edac.c
@@@ -2592,8 -2592,8 +2592,8 @@@ S:      Maintaine
  F:    fs/hpfs/
  
  HSO 3G MODEM DRIVER
 -P:    Denis Joseph Barrow
 -M:    d.barow@option.com
 +P:    Jan Dumon
 +M:    j.dumon@option.com
  W:    http://www.pharscape.org
  S:    Maintained
  F:    drivers/net/usb/hso.c
@@@ -3680,7 -3680,6 +3680,7 @@@ L:      microblaze-uclinux@itee.uq.edu.a
  W:    http://www.monstr.eu/fdt/
  T:    git git://git.monstr.eu/linux-2.6-microblaze.git
  S:    Supported
 +F:    arch/microblaze/
  
  MICROTEK X6 SCANNER
  P:    Oliver Neukum
@@@ -3917,19 -3916,12 +3917,12 @@@ F:   Documentation/blockdev/nbd.tx
  F:    drivers/block/nbd.c
  F:    include/linux/nbd.h
  
- NETWORK DEVICE DRIVERS
- P:    Jeff Garzik
- M:    jgarzik@pobox.com
- L:    netdev@vger.kernel.org
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
- S:    Maintained
- F:    drivers/net/
- 
  NETWORKING [GENERAL]
- P:    Networking Team
- M:    netdev@vger.kernel.org
+ P:    David S. Miller
+ M:    davem@davemloft.net
  L:    netdev@vger.kernel.org
  W:    http://linux-net.osdl.org/
+ T:    git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
  S:    Maintained
  F:    net/
  F:    include/net/
@@@ -4979,8 -4971,8 +4972,8 @@@ S:      Maintained for 2.6
  F:    Documentation/sgi-visws.txt
  
  SGI XP/XPC/XPNET DRIVER
 -P:    Dean Nelson
 -M:    dcn@sgi.com
 +P:    Robin Holt
 +M:    holt@sgi.com
  S:    Maintained
  F:    drivers/misc/sgi-xp/
  
@@@ -5314,9 -5306,7 +5307,9 @@@ L:      linux-sh@vger.kernel.or
  W:    http://www.linux-sh.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git
  S:    Supported
 +F:    Documentation/sh/
  F:    arch/sh/
 +F:    drivers/sh/
  
  SUSPEND TO RAM
  P:    Len Brown