Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Showing
- Documentation/networking/gianfar.txt 72 additions, 0 deletionsDocumentation/networking/gianfar.txt
- drivers/net/8139too.c 32 additions, 54 deletionsdrivers/net/8139too.c
- drivers/net/Kconfig 15 additions, 2 deletionsdrivers/net/Kconfig
- drivers/net/Makefile 6 additions, 1 deletiondrivers/net/Makefile
- drivers/net/bonding/Makefile 1 addition, 1 deletiondrivers/net/bonding/Makefile
- drivers/net/bonding/bond_3ad.c 47 additions, 59 deletionsdrivers/net/bonding/bond_3ad.c
- drivers/net/bonding/bond_3ad.h 0 additions, 13 deletionsdrivers/net/bonding/bond_3ad.h
- drivers/net/bonding/bond_alb.c 32 additions, 43 deletionsdrivers/net/bonding/bond_alb.c
- drivers/net/bonding/bond_alb.h 0 additions, 9 deletionsdrivers/net/bonding/bond_alb.h
- drivers/net/bonding/bond_main.c 197 additions, 584 deletionsdrivers/net/bonding/bond_main.c
- drivers/net/bonding/bond_sysfs.c 1358 additions, 0 deletionsdrivers/net/bonding/bond_sysfs.c
- drivers/net/bonding/bonding.h 29 additions, 23 deletionsdrivers/net/bonding/bonding.h
- drivers/net/chelsio/sge.c 10 additions, 9 deletionsdrivers/net/chelsio/sge.c
- drivers/net/chelsio/sge.h 0 additions, 2 deletionsdrivers/net/chelsio/sge.h
- drivers/net/e1000/e1000.h 3 additions, 1 deletiondrivers/net/e1000/e1000.h
- drivers/net/e1000/e1000_ethtool.c 85 additions, 26 deletionsdrivers/net/e1000/e1000_ethtool.c
- drivers/net/e1000/e1000_hw.c 48 additions, 19 deletionsdrivers/net/e1000/e1000_hw.c
- drivers/net/e1000/e1000_hw.h 3 additions, 1 deletiondrivers/net/e1000/e1000_hw.h
- drivers/net/e1000/e1000_main.c 24 additions, 40 deletionsdrivers/net/e1000/e1000_main.c
- drivers/net/gianfar.c 152 additions, 79 deletionsdrivers/net/gianfar.c
Loading
Please register or sign in to comment