Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/s2io.c
Showing
- Documentation/networking/00-INDEX 0 additions, 3 deletionsDocumentation/networking/00-INDEX
- Documentation/networking/sk98lin.txt 0 additions, 568 deletionsDocumentation/networking/sk98lin.txt
- drivers/atm/firestream.c 1 addition, 0 deletionsdrivers/atm/firestream.c
- drivers/atm/he.c 1 addition, 2 deletionsdrivers/atm/he.c
- drivers/atm/idt77252.c 2 additions, 4 deletionsdrivers/atm/idt77252.c
- drivers/atm/iphase.c 2 additions, 0 deletionsdrivers/atm/iphase.c
- drivers/net/Kconfig 1 addition, 1 deletiondrivers/net/Kconfig
- drivers/net/bfin_mac.c 0 additions, 2 deletionsdrivers/net/bfin_mac.c
- drivers/net/bonding/bond_sysfs.c 1 addition, 0 deletionsdrivers/net/bonding/bond_sysfs.c
- drivers/net/forcedeth.c 10 additions, 8 deletionsdrivers/net/forcedeth.c
- drivers/net/ibm_newemac/core.c 2 additions, 2 deletionsdrivers/net/ibm_newemac/core.c
- drivers/net/s2io.c 1 addition, 1 deletiondrivers/net/s2io.c
- drivers/net/tulip/eeprom.c 6 additions, 0 deletionsdrivers/net/tulip/eeprom.c
- drivers/net/tulip/tulip_core.c 6 additions, 1 deletiondrivers/net/tulip/tulip_core.c
- drivers/net/usb/Kconfig 1 addition, 1 deletiondrivers/net/usb/Kconfig
- drivers/net/usb/dm9601.c 1 addition, 1 deletiondrivers/net/usb/dm9601.c
- drivers/net/usb/pegasus.c 0 additions, 4 deletionsdrivers/net/usb/pegasus.c
- drivers/net/wan/lapbether.c 1 addition, 1 deletiondrivers/net/wan/lapbether.c
- drivers/net/wireless/b43/dma.c 6 additions, 1 deletiondrivers/net/wireless/b43/dma.c
- drivers/net/wireless/b43/pcmcia.c 4 additions, 2 deletionsdrivers/net/wireless/b43/pcmcia.c
Loading
Please register or sign in to comment