Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Showing
- Documentation/networking/phy.txt 288 additions, 0 deletionsDocumentation/networking/phy.txt
- drivers/net/Kconfig 2 additions, 0 deletionsdrivers/net/Kconfig
- drivers/net/Makefile 1 addition, 0 deletionsdrivers/net/Makefile
- drivers/net/Space.c 0 additions, 12 deletionsdrivers/net/Space.c
- drivers/net/bonding/bond_alb.c 6 additions, 11 deletionsdrivers/net/bonding/bond_alb.c
- drivers/net/bonding/bond_main.c 57 additions, 1 deletiondrivers/net/bonding/bond_main.c
- drivers/net/bonding/bonding.h 3 additions, 0 deletionsdrivers/net/bonding/bonding.h
- drivers/net/e1000/e1000_main.c 2 additions, 2 deletionsdrivers/net/e1000/e1000_main.c
- drivers/net/eepro100.c 4 additions, 4 deletionsdrivers/net/eepro100.c
- drivers/net/forcedeth.c 427 additions, 155 deletionsdrivers/net/forcedeth.c
- drivers/net/hamradio/Kconfig 1 addition, 1 deletiondrivers/net/hamradio/Kconfig
- drivers/net/hamradio/baycom_epp.c 2 additions, 1 deletiondrivers/net/hamradio/baycom_epp.c
- drivers/net/hamradio/baycom_par.c 2 additions, 1 deletiondrivers/net/hamradio/baycom_par.c
- drivers/net/hamradio/baycom_ser_fdx.c 2 additions, 1 deletiondrivers/net/hamradio/baycom_ser_fdx.c
- drivers/net/hamradio/baycom_ser_hdx.c 2 additions, 1 deletiondrivers/net/hamradio/baycom_ser_hdx.c
- drivers/net/hamradio/mkiss.c 524 additions, 562 deletionsdrivers/net/hamradio/mkiss.c
- drivers/net/ixgb/ixgb.h 1 addition, 1 deletiondrivers/net/ixgb/ixgb.h
- drivers/net/ixgb/ixgb_ee.c 1 addition, 169 deletionsdrivers/net/ixgb/ixgb_ee.c
- drivers/net/ixgb/ixgb_ethtool.c 42 additions, 17 deletionsdrivers/net/ixgb/ixgb_ethtool.c
- drivers/net/ixgb/ixgb_hw.h 0 additions, 9 deletionsdrivers/net/ixgb/ixgb_hw.h
Loading
Please register or sign in to comment