Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

2026-09-24 18:16:04 +00:00 · 2008-05-23 00:05:14 -07:00 · 2008-05-23 00:05:14 -07:00 · 7bece8155b
commit 7bece8155b
parent b9a2f2e450 bdefff1f54
48 changed files with 853 additions and 576 deletions
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
--- a/drivers/net/s2io-regs.h
+++ b/drivers/net/s2io-regs.h
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
--- a/drivers/net/sb1250-mac.c
+++ b/drivers/net/sb1250-mac.c
--- a/drivers/net/sc92031.c
+++ b/drivers/net/sc92031.c
--- a/drivers/net/sfc/bitfield.h
+++ b/drivers/net/sfc/bitfield.h
--- a/drivers/net/sfc/boards.c
+++ b/drivers/net/sfc/boards.c
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
--- a/drivers/net/sfc/falcon.h
+++ b/drivers/net/sfc/falcon.h
--- a/drivers/net/sfc/falcon_hwdefs.h
+++ b/drivers/net/sfc/falcon_hwdefs.h
--- a/drivers/net/sfc/falcon_io.h
+++ b/drivers/net/sfc/falcon_io.h
--- a/drivers/net/sfc/falcon_xmac.c
+++ b/drivers/net/sfc/falcon_xmac.c
--- a/drivers/net/sfc/net_driver.h
+++ b/drivers/net/sfc/net_driver.h
--- a/drivers/net/sfc/rx.c
+++ b/drivers/net/sfc/rx.c
--- a/drivers/net/sfc/selftest.c
+++ b/drivers/net/sfc/selftest.c
--- a/drivers/net/sfc/sfe4001.c
+++ b/drivers/net/sfc/sfe4001.c
--- a/drivers/net/sfc/tenxpress.c
+++ b/drivers/net/sfc/tenxpress.c
--- a/drivers/net/sfc/tx.c
+++ b/drivers/net/sfc/tx.c
--- a/drivers/net/sfc/workarounds.h
+++ b/drivers/net/sfc/workarounds.h
--- a/drivers/net/sfc/xfp_phy.c
+++ b/drivers/net/sfc/xfp_phy.c
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
--- a/drivers/net/tokenring/3c359.h
+++ b/drivers/net/tokenring/3c359.h
--- a/drivers/net/tokenring/olympic.h
+++ b/drivers/net/tokenring/olympic.h
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
--- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
--- a/drivers/net/wan/hdlc.c
+++ b/drivers/net/wan/hdlc.c
--- a/drivers/net/wan/hdlc_cisco.c
+++ b/drivers/net/wan/hdlc_cisco.c
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c