Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/ethernet/amd/pcnet32.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
Simple merge

diff --cc drivers/net/ethernet/freescale/gianfar.c
Simple merge

diff --cc drivers/net/ethernet/freescale/gianfar_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/82571.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/e1000.h
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/ethtool.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/ich8lan.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/lib.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/nvidia/forcedeth.c
Simple merge

diff --cc drivers/net/ethernet/renesas/sh_eth.c
Simple merge

diff --cc drivers/net/ethernet/via/via-velocity.c
Simple merge

diff --cc drivers/net/vmxnet3/vmxnet3_drv.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv6/sit.c
Simple merge