Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (86 commits) ipv4: fix redirect handling ping: dont increment ICMP_MIB_INERRORS sky2: fix hang in napi_disable sky2: enforce minimum ring size bonding: Don't allow mode change via sysfs with slaves present f_phonet: fix page offset of first received fragment stmmac: fix pm functions avoiding sleep on spinlock stmmac: remove spin_lock in stmmac_ioctl. stmmac: parameters auto-tuning through HW cap reg stmmac: fix advertising 1000Base capabilties for non GMII iface stmmac: use mdelay on timeout of sw reset sky2: version 1.30 sky2: used fixed RSS key sky2: reduce default Tx ring size sky2: rename up/down functions sky2: pci posting issues sky2: fix hang on shutdown (and other irq issues) r6040: fix check against MCRO_HASHEN bit in r6040_multicast_list MAINTAINERS: change email address for shemminger pch_gbe: Move #include of module.h ...
No related branches found
No related tags found
Showing
- Documentation/networking/ip-sysctl.txt 1 addition, 1 deletionDocumentation/networking/ip-sysctl.txt
- MAINTAINERS 3 additions, 3 deletionsMAINTAINERS
- arch/cris/arch-v10/drivers/Kconfig 1 addition, 1 deletionarch/cris/arch-v10/drivers/Kconfig
- arch/cris/arch-v32/drivers/Kconfig 1 addition, 1 deletionarch/cris/arch-v32/drivers/Kconfig
- drivers/bluetooth/btusb.c 3 additions, 0 deletionsdrivers/bluetooth/btusb.c
- drivers/net/Kconfig 2 additions, 0 deletionsdrivers/net/Kconfig
- drivers/net/bonding/bond_sysfs.c 7 additions, 0 deletionsdrivers/net/bonding/bond_sysfs.c
- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c 29 additions, 21 deletionsdrivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c 6 additions, 9 deletionsdrivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
- drivers/net/ethernet/cadence/Kconfig 1 addition, 0 deletionsdrivers/net/ethernet/cadence/Kconfig
- drivers/net/ethernet/lantiq_etop.c 2 additions, 0 deletionsdrivers/net/ethernet/lantiq_etop.c
- drivers/net/ethernet/marvell/sky2.c 68 additions, 38 deletionsdrivers/net/ethernet/marvell/sky2.c
- drivers/net/ethernet/marvell/sky2.h 1 addition, 0 deletionsdrivers/net/ethernet/marvell/sky2.h
- drivers/net/ethernet/mellanox/mlx4/en_rx.c 5 additions, 1 deletiondrivers/net/ethernet/mellanox/mlx4/en_rx.c
- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h 1 addition, 0 deletionsdrivers/net/ethernet/mellanox/mlx4/mlx4_en.h
- drivers/net/ethernet/nvidia/forcedeth.c 27 additions, 9 deletionsdrivers/net/ethernet/nvidia/forcedeth.c
- drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c 1 addition, 1 deletiondrivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
- drivers/net/ethernet/rdc/r6040.c 1 addition, 1 deletiondrivers/net/ethernet/rdc/r6040.c
- drivers/net/ethernet/realtek/r8169.c 1 addition, 1 deletiondrivers/net/ethernet/realtek/r8169.c
- drivers/net/ethernet/smsc/smsc911x.c 12 additions, 0 deletionsdrivers/net/ethernet/smsc/smsc911x.c
Loading
Please register or sign in to comment