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: pcnet_cs : add new id chelsio: error path fix s390: iucv Kconfig help description changes s390: qeth driver fixes: atomic context fixups s390: qeth driver fixes: packet socket s390: qeth driver fixes: VLAN hdr, perf stats forcedeth: sideband management fix Revert "[PATCH] e1000: disable TSO on the 82544 with slab debugging" qeth: fix uaccess handling and get rid of unused variable qla3xxx: Add delay to NVRAM register access. qla3xxx: Remove NETIF_F_LLTX from driver features. ixgb: Write RA register high word first, increment version ixgb: Maybe stop TX if not enough free descriptors ixgb: Fix early TSO completion [PATCH] ipw2100: Fix dropping fragmented small packet problem [PATCH] ieee80211: WLAN_GET_SEQ_SEQ fix (select correct region)
Showing
- drivers/net/chelsio/my3126.c 3 additions, 2 deletionsdrivers/net/chelsio/my3126.c
- drivers/net/e1000/e1000_main.c 0 additions, 6 deletionsdrivers/net/e1000/e1000_main.c
- drivers/net/forcedeth.c 56 additions, 55 deletionsdrivers/net/forcedeth.c
- drivers/net/ixgb/ixgb.h 1 addition, 0 deletionsdrivers/net/ixgb/ixgb.h
- drivers/net/ixgb/ixgb_ethtool.c 1 addition, 0 deletionsdrivers/net/ixgb/ixgb_ethtool.c
- drivers/net/ixgb/ixgb_hw.c 2 additions, 1 deletiondrivers/net/ixgb/ixgb_hw.c
- drivers/net/ixgb/ixgb_main.c 51 additions, 6 deletionsdrivers/net/ixgb/ixgb_main.c
- drivers/net/pcmcia/pcnet_cs.c 2 additions, 0 deletionsdrivers/net/pcmcia/pcnet_cs.c
- drivers/net/qla3xxx.c 23 additions, 15 deletionsdrivers/net/qla3xxx.c
- drivers/net/wireless/ipw2100.c 1 addition, 1 deletiondrivers/net/wireless/ipw2100.c
- drivers/s390/net/Kconfig 1 addition, 4 deletionsdrivers/s390/net/Kconfig
- drivers/s390/net/qeth.h 1 addition, 1 deletiondrivers/s390/net/qeth.h
- drivers/s390/net/qeth_main.c 93 additions, 124 deletionsdrivers/s390/net/qeth_main.c
- include/net/ieee80211.h 1 addition, 1 deletioninclude/net/ieee80211.h
Loading
Please register or sign in to comment