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 ...
Showing
此差异已折叠。
drivers/net/stmmac/Kconfig
0 → 100644
drivers/net/stmmac/Makefile
0 → 100644
drivers/net/stmmac/common.h
0 → 100644
drivers/net/stmmac/descs.h
0 → 100644
drivers/net/stmmac/gmac.c
0 → 100644
drivers/net/stmmac/gmac.h
0 → 100644
drivers/net/stmmac/mac100.c
0 → 100644
drivers/net/stmmac/mac100.h
0 → 100644
drivers/net/stmmac/stmmac.h
0 → 100644
drivers/net/stmmac/stmmac_main.c
0 → 100644
此差异已折叠。
drivers/net/stmmac/stmmac_mdio.c
0 → 100644
drivers/net/stmmac/stmmac_timer.c
0 → 100644
drivers/net/stmmac/stmmac_timer.h
0 → 100644
drivers/net/vmxnet3/Makefile
0 → 100644
drivers/net/vmxnet3/upt1_defs.h
0 → 100644
此差异已折叠。
drivers/net/vmxnet3/vmxnet3_drv.c
0 → 100644
此差异已折叠。
此差异已折叠。
drivers/net/vmxnet3/vmxnet3_int.h
0 → 100644
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
想要评论请 注册 或 登录