Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/sfc/net_driver.h drivers/net/sfc/siena.c
No related branches found
No related tags found
Showing
- drivers/isdn/capi/kcapi.c 3 additions, 3 deletionsdrivers/isdn/capi/kcapi.c
- drivers/isdn/hardware/mISDN/netjet.c 2 additions, 2 deletionsdrivers/isdn/hardware/mISDN/netjet.c
- drivers/net/benet/be_cmds.c 1 addition, 1 deletiondrivers/net/benet/be_cmds.c
- drivers/net/bnx2.c 13 additions, 1 deletiondrivers/net/bnx2.c
- drivers/net/can/mscan/mpc5xxx_can.c 5 additions, 5 deletionsdrivers/net/can/mscan/mpc5xxx_can.c
- drivers/net/e1000e/netdev.c 1 addition, 1 deletiondrivers/net/e1000e/netdev.c
- drivers/net/enic/enic.h 7 additions, 0 deletionsdrivers/net/enic/enic.h
- drivers/net/enic/enic_main.c 97 additions, 103 deletionsdrivers/net/enic/enic_main.c
- drivers/net/epic100.c 4 additions, 3 deletionsdrivers/net/epic100.c
- drivers/net/fec.c 8 additions, 8 deletionsdrivers/net/fec.c
- drivers/net/greth.c 5 additions, 6 deletionsdrivers/net/greth.c
- drivers/net/ixgbe/ixgbe_common.c 2 additions, 0 deletionsdrivers/net/ixgbe/ixgbe_common.c
- drivers/net/ixgbe/ixgbe_main.c 1 addition, 1 deletiondrivers/net/ixgbe/ixgbe_main.c
- drivers/net/ixgbe/ixgbe_type.h 1 addition, 0 deletionsdrivers/net/ixgbe/ixgbe_type.h
- drivers/net/korina.c 15 additions, 17 deletionsdrivers/net/korina.c
- drivers/net/ksz884x.c 2 additions, 1 deletiondrivers/net/ksz884x.c
- drivers/net/ppp_generic.c 1 addition, 1 deletiondrivers/net/ppp_generic.c
- drivers/net/r8169.c 5 additions, 0 deletionsdrivers/net/r8169.c
- drivers/net/sfc/net_driver.h 1 addition, 1 deletiondrivers/net/sfc/net_driver.h
- drivers/net/sfc/siena.c 1 addition, 1 deletiondrivers/net/sfc/siena.c
Loading
Please register or sign in to comment