-
- Downloads
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/bnx2x/bnx2x_ethtool.c
Showing
- MAINTAINERS 1 addition, 0 deletionsMAINTAINERS
- drivers/connector/connector.c 1 addition, 0 deletionsdrivers/connector/connector.c
- drivers/net/bna/bfa_ioc.c 18 additions, 13 deletionsdrivers/net/bna/bfa_ioc.c
- drivers/net/bna/bfa_ioc.h 1 addition, 0 deletionsdrivers/net/bna/bfa_ioc.h
- drivers/net/bna/bfa_ioc_ct.c 28 additions, 0 deletionsdrivers/net/bna/bfa_ioc_ct.c
- drivers/net/bna/bfi.h 4 additions, 2 deletionsdrivers/net/bna/bfi.h
- drivers/net/bna/bnad.c 0 additions, 1 deletiondrivers/net/bna/bnad.c
- drivers/net/bnx2x/bnx2x_ethtool.c 5 additions, 6 deletionsdrivers/net/bnx2x/bnx2x_ethtool.c
- drivers/net/can/mscan/mpc5xxx_can.c 1 addition, 1 deletiondrivers/net/can/mscan/mpc5xxx_can.c
- drivers/net/loopback.c 2 additions, 1 deletiondrivers/net/loopback.c
- drivers/net/natsemi.c 3 additions, 0 deletionsdrivers/net/natsemi.c
- drivers/net/qlcnic/qlcnic.h 1 addition, 0 deletionsdrivers/net/qlcnic/qlcnic.h
- drivers/net/qlcnic/qlcnic_main.c 14 additions, 0 deletionsdrivers/net/qlcnic/qlcnic_main.c
- drivers/net/sfc/efx.c 4 additions, 2 deletionsdrivers/net/sfc/efx.c
- drivers/net/sfc/io.h 2 additions, 0 deletionsdrivers/net/sfc/io.h
- drivers/net/sfc/net_driver.h 0 additions, 2 deletionsdrivers/net/sfc/net_driver.h
- drivers/net/sfc/nic.c 15 additions, 7 deletionsdrivers/net/sfc/nic.c
- drivers/net/sfc/nic.h 1 addition, 0 deletionsdrivers/net/sfc/nic.h
- drivers/net/sfc/selftest.c 6 additions, 19 deletionsdrivers/net/sfc/selftest.c
- drivers/net/sfc/tx.c 2 additions, 1 deletiondrivers/net/sfc/tx.c
Loading
Please register or sign in to comment