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: e1000: Add device IDs of new 82571 board variants xen-netfront: Avoid deref'ing skbafter it is potentially freed. 3c59x maintainer 3c59x: fix duplex configuration natsemi: fix netdev error acounting ax88796 printk fixes myri10ge: Use the pause counter to avoid a needless device reset via-rhine: disable rx_copybreak on archs that don't allow unaligned DMA access
Showing
- MAINTAINERS 6 additions, 0 deletionsMAINTAINERS
- drivers/net/3c59x.c 1 addition, 0 deletionsdrivers/net/3c59x.c
- drivers/net/ax88796.c 3 additions, 2 deletionsdrivers/net/ax88796.c
- drivers/net/e1000/e1000_ethtool.c 2 additions, 0 deletionsdrivers/net/e1000/e1000_ethtool.c
- drivers/net/e1000/e1000_hw.c 5 additions, 0 deletionsdrivers/net/e1000/e1000_hw.c
- drivers/net/e1000/e1000_hw.h 3 additions, 0 deletionsdrivers/net/e1000/e1000_hw.h
- drivers/net/e1000/e1000_main.c 4 additions, 0 deletionsdrivers/net/e1000/e1000_main.c
- drivers/net/myri10ge/myri10ge.c 18 additions, 7 deletionsdrivers/net/myri10ge/myri10ge.c
- drivers/net/natsemi.c 3 additions, 0 deletionsdrivers/net/natsemi.c
- drivers/net/via-rhine.c 6 additions, 0 deletionsdrivers/net/via-rhine.c
- drivers/net/xen-netfront.c 4 additions, 3 deletionsdrivers/net/xen-netfront.c
Loading
Please register or sign in to comment