-
- Downloads
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/can/usb/ems_usb.c
Showing
- drivers/isdn/hisax/elsa_ser.c 11 additions, 11 deletionsdrivers/isdn/hisax/elsa_ser.c
- drivers/net/benet/be.h 2 additions, 0 deletionsdrivers/net/benet/be.h
- drivers/net/benet/be_ethtool.c 5 additions, 3 deletionsdrivers/net/benet/be_ethtool.c
- drivers/net/benet/be_main.c 17 additions, 11 deletionsdrivers/net/benet/be_main.c
- drivers/net/can/dev.c 17 additions, 0 deletionsdrivers/net/can/dev.c
- drivers/net/can/usb/ems_usb.c 4 additions, 1 deletiondrivers/net/can/usb/ems_usb.c
- drivers/net/cassini.c 3 additions, 2 deletionsdrivers/net/cassini.c
- drivers/net/fsl_pq_mdio.c 1 addition, 0 deletionsdrivers/net/fsl_pq_mdio.c
- drivers/net/ixgbe/ixgbe_main.c 78 additions, 6 deletionsdrivers/net/ixgbe/ixgbe_main.c
- drivers/net/macsonic.c 60 additions, 57 deletionsdrivers/net/macsonic.c
- drivers/net/qlge/qlge_main.c 2 additions, 0 deletionsdrivers/net/qlge/qlge_main.c
- drivers/net/qlge/qlge_mpi.c 1 addition, 1 deletiondrivers/net/qlge/qlge_mpi.c
- drivers/net/wireless/ipw2x00/ipw2100.c 1 addition, 4 deletionsdrivers/net/wireless/ipw2x00/ipw2100.c
- drivers/net/wireless/ipw2x00/ipw2200.c 0 additions, 2 deletionsdrivers/net/wireless/ipw2x00/ipw2200.c
- drivers/net/wireless/ipw2x00/libipw.h 0 additions, 1 deletiondrivers/net/wireless/ipw2x00/libipw.h
- drivers/net/wireless/ipw2x00/libipw_module.c 5 additions, 9 deletionsdrivers/net/wireless/ipw2x00/libipw_module.c
- drivers/net/wireless/rt2x00/rt2x00dev.c 2 additions, 2 deletionsdrivers/net/wireless/rt2x00/rt2x00dev.c
- drivers/net/wireless/rt2x00/rt2x00link.c 7 additions, 4 deletionsdrivers/net/wireless/rt2x00/rt2x00link.c
- drivers/net/wireless/rt2x00/rt2x00usb.c 8 additions, 1 deletiondrivers/net/wireless/rt2x00/rt2x00usb.c
- drivers/net/wireless/rtl818x/rtl8187_leds.c 2 additions, 2 deletionsdrivers/net/wireless/rtl818x/rtl8187_leds.c
Loading
Please register or sign in to comment