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: natsemi: Avoid IntrStatus lossage if RX state machine resets. natsemi: Fix NAPI for interrupt sharing natsemi: Consistently use interrupt enable/disable functions NetXen: Fix softlockup seen during hardware access NetXen: Bug fix for Jumbo frames on XG card skge: set mac address bonding fix
No related branches found
No related tags found
Showing
- drivers/net/natsemi.c 31 additions, 27 deletionsdrivers/net/natsemi.c
- drivers/net/netxen/netxen_nic.h 1 addition, 0 deletionsdrivers/net/netxen/netxen_nic.h
- drivers/net/netxen/netxen_nic_ethtool.c 1 addition, 0 deletionsdrivers/net/netxen/netxen_nic_ethtool.c
- drivers/net/netxen/netxen_nic_hw.c 4 additions, 1 deletiondrivers/net/netxen/netxen_nic_hw.c
- drivers/net/netxen/netxen_nic_init.c 9 additions, 2 deletionsdrivers/net/netxen/netxen_nic_init.c
- drivers/net/skge.c 17 additions, 11 deletionsdrivers/net/skge.c
Loading
Please register or sign in to comment