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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits)
  forcedeth: fix a few sparse warnings (variable shadowing)
  forcedeth: Improve stats counters
  forcedeth: remove unneeded stats updates
  forcedeth: Acknowledge only interrupts that are being processed
  forcedeth: fix race when unloading module
  MAINTAINERS/rds: update maintainer
  wanrouter: Remove kernel_lock annotations
  usbnet: fix oops in usbnet_start_xmit
  ixgbe: Fix compile for kernel without CONFIG_PCI_IOV defined
  etherh: Add MAINTAINERS entry for etherh
  bonding: comparing a u8 with -1 is always false
  sky2: fix regression on Yukon Optima
  netlink: clarify attribute length check documentation
  netlink: validate NLA_MSECS length
  i825xx:xscale:8390:freescale: Fix Kconfig dependancies
  macvlan: receive multicast with local address
  tg3: Update version to 3.121
  tg3: Eliminate timer race with reset_task
  tg3: Schedule at most one tg3_reset_task run
  tg3: Obtain PCI function number from device
  ...

1 files changed, 2 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 6388a96dc1c4..4c5eac0e51d1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1032,6 +1032,7 @@ F:	arch/arm/include/asm/hardware/ioc.h
 F:      arch/arm/include/asm/hardware/iomd.h
 F:      arch/arm/include/asm/hardware/memc.h
 F:      arch/arm/mach-rpc/
+F:      drivers/net/ethernet/8390/etherh.c
 F:      drivers/net/ethernet/i825xx/ether1*
 F:      drivers/net/ethernet/seeq/ether3*
 F:      drivers/scsi/arm/
@@ -5470,7 +5471,7 @@ S:	Maintained
 F:      drivers/net/ethernet/rdc/r6040.c
 
 RDS - RELIABLE DATAGRAM SOCKETS
-M:      Andy Grover <andy.grover@oracle.com>
+M:      Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
 L:      rds-devel@oss.oracle.com (moderated for non-subscribers)
 S:      Supported
 F:      net/rds/