Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: WOL bugfix for 3c59x.c skge 1.12 skge: add a debug interface skge: eeprom support skge: internal stats skge: XM PHY handling fixes skge: changing MTU while running causes problems skge: fix ram buffer size calculation gianfar: Fix compile regression caused by 09f75cd7 net: Fix new EMAC driver for NAPI changes bonding: two small fixes for IPoIB support e1000e: don't poke PHY registers to retreive link status e1000e: fix error checks e1000e: Fix debug printk macro tokenring/3c359.c: fixed array index problem [netdrvr] forcedeth: remove in-driver copy of net_device_stats [netdrvr] forcedeth: improved probe info; dev_printk() cleanups forcedeth: fix NAPI rx poll function
No related branches found
No related tags found
Showing
- drivers/net/3c59x.c 7 additions, 1 deletiondrivers/net/3c59x.c
- drivers/net/Kconfig 10 additions, 0 deletionsdrivers/net/Kconfig
- drivers/net/bonding/bond_main.c 5 additions, 6 deletionsdrivers/net/bonding/bond_main.c
- drivers/net/bonding/bonding.h 2 additions, 2 deletionsdrivers/net/bonding/bonding.h
- drivers/net/e1000e/ethtool.c 23 additions, 12 deletionsdrivers/net/e1000e/ethtool.c
- drivers/net/e1000e/hw.h 1 addition, 1 deletiondrivers/net/e1000e/hw.h
- drivers/net/forcedeth.c 98 additions, 70 deletionsdrivers/net/forcedeth.c
- drivers/net/gianfar.c 3 additions, 4 deletionsdrivers/net/gianfar.c
- drivers/net/ibm_newemac/mal.c 17 additions, 8 deletionsdrivers/net/ibm_newemac/mal.c
- drivers/net/skge.c 382 additions, 103 deletionsdrivers/net/skge.c
- drivers/net/skge.h 9 additions, 8 deletionsdrivers/net/skge.h
- drivers/net/tokenring/3c359.c 1 addition, 1 deletiondrivers/net/tokenring/3c359.c
Loading
Please register or sign in to comment