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: (53 commits) vmxnet: fix 2 build problems net: add support for STMicroelectronics Ethernet controllers. net: ks8851_mll uses mii interfaces net/fec_mpc52xx: Fix kernel panic on FEC error net: Fix OF platform drivers coldplug/hotplug when compiled as modules TI DaVinci EMAC: Clear statistics register properly. r8169: partial support and phy init for the 8168d irda/sa1100_ir: check return value of startup hook udp: Fix udp_poll() and ioctl() WAN: fix Cisco HDLC handshaking. tcp: fix tcp_defer_accept to consider the timeout 3c574_cs: spin_lock the set_multicast_list function net: Teach pegasus driver to ignore bluetoother adapters with clashing Vendor:Product IDs netxen: fix pci bar mapping ethoc: fix warning from 32bit build libertas: fix build net: VMware virtual Ethernet NIC driver: vmxnet3 net: Fix IXP 2000 network driver building. libertas: fix build mac80211: document ieee80211_rx() context requirement ...
No related branches found
No related tags found
Showing
- MAINTAINERS 8 additions, 0 deletionsMAINTAINERS
- drivers/net/Kconfig 11 additions, 0 deletionsdrivers/net/Kconfig
- drivers/net/Makefile 6 additions, 4 deletionsdrivers/net/Makefile
- drivers/net/acenic.c 2 additions, 1 deletiondrivers/net/acenic.c
- drivers/net/can/sja1000/sja1000_of_platform.c 1 addition, 0 deletionsdrivers/net/can/sja1000/sja1000_of_platform.c
- drivers/net/davinci_emac.c 24 additions, 12 deletionsdrivers/net/davinci_emac.c
- drivers/net/ethoc.c 2 additions, 1 deletiondrivers/net/ethoc.c
- drivers/net/fec_mpc52xx.c 0 additions, 6 deletionsdrivers/net/fec_mpc52xx.c
- drivers/net/fec_mpc52xx_phy.c 1 addition, 0 deletionsdrivers/net/fec_mpc52xx_phy.c
- drivers/net/fs_enet/fs_enet-main.c 1 addition, 0 deletionsdrivers/net/fs_enet/fs_enet-main.c
- drivers/net/fs_enet/mii-bitbang.c 1 addition, 0 deletionsdrivers/net/fs_enet/mii-bitbang.c
- drivers/net/fs_enet/mii-fec.c 1 addition, 0 deletionsdrivers/net/fs_enet/mii-fec.c
- drivers/net/fsl_pq_mdio.c 1 addition, 0 deletionsdrivers/net/fsl_pq_mdio.c
- drivers/net/gianfar.c 1 addition, 3 deletionsdrivers/net/gianfar.c
- drivers/net/ibm_newemac/core.c 7 additions, 2 deletionsdrivers/net/ibm_newemac/core.c
- drivers/net/ibm_newemac/emac.h 1 addition, 0 deletionsdrivers/net/ibm_newemac/emac.h
- drivers/net/irda/sa1100_ir.c 5 additions, 2 deletionsdrivers/net/irda/sa1100_ir.c
- drivers/net/ixp2000/enp2611.c 1 addition, 17 deletionsdrivers/net/ixp2000/enp2611.c
- drivers/net/ixp2000/ixpdev.c 11 additions, 0 deletionsdrivers/net/ixp2000/ixpdev.c
- drivers/net/netxen/netxen_nic_main.c 2 additions, 1 deletiondrivers/net/netxen/netxen_nic_main.c
Loading
Please register or sign in to comment