Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/e1000/e1000_main.c
Showing
- Documentation/networking/alias.txt 6 additions, 19 deletionsDocumentation/networking/alias.txt
- MAINTAINERS 0 additions, 2 deletionsMAINTAINERS
- drivers/net/e1000/e1000_main.c 2 additions, 2 deletionsdrivers/net/e1000/e1000_main.c
- drivers/net/gianfar_mii.c 2 additions, 0 deletionsdrivers/net/gianfar_mii.c
- drivers/net/netxen/netxen_nic.h 1 addition, 1 deletiondrivers/net/netxen/netxen_nic.h
- drivers/net/netxen/netxen_nic_init.c 3 additions, 1 deletiondrivers/net/netxen/netxen_nic_init.c
- drivers/net/r6040.c 0 additions, 1 deletiondrivers/net/r6040.c
- drivers/net/sfc/efx.c 41 additions, 18 deletionsdrivers/net/sfc/efx.c
- drivers/net/sfc/efx.h 6 additions, 3 deletionsdrivers/net/sfc/efx.h
- drivers/net/sfc/ethtool.c 0 additions, 3 deletionsdrivers/net/sfc/ethtool.c
- drivers/net/sfc/falcon.c 18 additions, 14 deletionsdrivers/net/sfc/falcon.c
- drivers/net/sfc/mdio_10g.c 89 additions, 102 deletionsdrivers/net/sfc/mdio_10g.c
- drivers/net/sfc/mdio_10g.h 2 additions, 1 deletiondrivers/net/sfc/mdio_10g.h
- drivers/net/sfc/net_driver.h 4 additions, 5 deletionsdrivers/net/sfc/net_driver.h
- drivers/net/sfc/phy.h 0 additions, 1 deletiondrivers/net/sfc/phy.h
- drivers/net/sfc/selftest.c 4 additions, 3 deletionsdrivers/net/sfc/selftest.c
- drivers/net/sfc/sfe4001.c 33 additions, 9 deletionsdrivers/net/sfc/sfe4001.c
- drivers/net/sfc/tenxpress.c 77 additions, 136 deletionsdrivers/net/sfc/tenxpress.c
- drivers/net/sfc/workarounds.h 5 additions, 7 deletionsdrivers/net/sfc/workarounds.h
- drivers/net/skfp/skfddi.c 2 additions, 2 deletionsdrivers/net/skfp/skfddi.c
Loading
Please register or sign in to comment