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-13 01:09:15 -07:00 · 2008-05-13 01:09:15 -07:00 · 47ac3199ac
commit 47ac3199ac
parent 608961a5ec 993245908e
40 changed files with 3081 additions and 547 deletions
--- a/6
+++ b/6
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
--- a/drivers/net/atlx/atl1.h
+++ b/drivers/net/atlx/atl1.h
--- a/drivers/net/atlx/atlx.c
+++ b/drivers/net/atlx/atlx.c
--- a/drivers/net/atlx/atlx.h
+++ b/drivers/net/atlx/atlx.h
--- a/drivers/net/cxgb3/adapter.h
+++ b/drivers/net/cxgb3/adapter.h
--- a/drivers/net/cxgb3/common.h
+++ b/drivers/net/cxgb3/common.h
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
--- a/drivers/net/cxgb3/regs.h
+++ b/drivers/net/cxgb3/regs.h
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
--- a/drivers/net/ehea/ehea.h
+++ b/drivers/net/ehea/ehea.h
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
--- a/drivers/net/ehea/ehea_qmr.c
+++ b/drivers/net/ehea/ehea_qmr.c
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
--- a/drivers/net/myri10ge/myri10ge_mcp.h
+++ b/drivers/net/myri10ge/myri10ge_mcp.h
--- a/drivers/net/myri10ge/myri10ge_mcp_gen_header.h
+++ b/drivers/net/myri10ge/myri10ge_mcp_gen_header.h
--- a/drivers/net/sfc/Makefile
+++ b/drivers/net/sfc/Makefile
--- a/drivers/net/sfc/boards.h
+++ b/drivers/net/sfc/boards.h
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
--- a/drivers/net/sfc/enum.h
+++ b/drivers/net/sfc/enum.h
--- a/drivers/net/sfc/ethtool.c
+++ b/drivers/net/sfc/ethtool.c
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
--- a/drivers/net/sfc/falcon_hwdefs.h
+++ b/drivers/net/sfc/falcon_hwdefs.h
--- a/drivers/net/sfc/falcon_xmac.c
+++ b/drivers/net/sfc/falcon_xmac.c
--- a/drivers/net/sfc/mdio_10g.c
+++ b/drivers/net/sfc/mdio_10g.c
--- a/drivers/net/sfc/mdio_10g.h
+++ b/drivers/net/sfc/mdio_10g.h
--- 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/selftest.h
+++ b/drivers/net/sfc/selftest.h
--- 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/xfp_phy.c
+++ b/drivers/net/sfc/xfp_phy.c
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h