Manual merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
This is a fixed-up version of the broken "upstream-2.6.13" branch, where I re-did the manual merge of drivers/net/r8169.c by hand, and made sure the history is all good.
No related branches found
No related tags found
Showing
- Documentation/networking/generic-hdlc.txt 26 additions, 25 deletionsDocumentation/networking/generic-hdlc.txt
- Documentation/networking/multicast.txt 0 additions, 1 deletionDocumentation/networking/multicast.txt
- Documentation/networking/net-modules.txt 0 additions, 3 deletionsDocumentation/networking/net-modules.txt
- drivers/net/8139cp.c 69 additions, 31 deletionsdrivers/net/8139cp.c
- drivers/net/8139too.c 87 additions, 107 deletionsdrivers/net/8139too.c
- drivers/net/Kconfig 24 additions, 23 deletionsdrivers/net/Kconfig
- drivers/net/Makefile 2 additions, 2 deletionsdrivers/net/Makefile
- drivers/net/Space.c 0 additions, 6 deletionsdrivers/net/Space.c
- drivers/net/arm/etherh.c 9 additions, 7 deletionsdrivers/net/arm/etherh.c
- drivers/net/au1000_eth.c 2 additions, 8 deletionsdrivers/net/au1000_eth.c
- drivers/net/bmac.c 0 additions, 2 deletionsdrivers/net/bmac.c
- drivers/net/dm9000.c 1219 additions, 0 deletionsdrivers/net/dm9000.c
- drivers/net/dm9000.h 135 additions, 0 deletionsdrivers/net/dm9000.h
- drivers/net/fmv18x.c 0 additions, 689 deletionsdrivers/net/fmv18x.c
- drivers/net/pcmcia/pcnet_cs.c 9 additions, 8 deletionsdrivers/net/pcmcia/pcnet_cs.c
- drivers/net/ppp_generic.c 110 additions, 67 deletionsdrivers/net/ppp_generic.c
- drivers/net/r8169.c 252 additions, 68 deletionsdrivers/net/r8169.c
- drivers/net/sk98lin/skge.c 3 additions, 5 deletionsdrivers/net/sk98lin/skge.c
- drivers/net/sk_g16.c 0 additions, 2066 deletionsdrivers/net/sk_g16.c
- drivers/net/sk_g16.h 0 additions, 165 deletionsdrivers/net/sk_g16.h
Loading
Please register or sign in to comment