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: r8169: fix suspend/resume for down interface r8169: issue request_irq after the private data are completely initialized b44: fix IFF_ALLMULTI handling of CAM slots cxgb3 - Firwmare update cxgb3 - Tighten xgmac workaround cxgb3 - detect NIC only adapters cxgb3 - Safeguard TCAM size usage
No related branches found
No related tags found
Showing
- drivers/net/b44.c 1 addition, 1 deletiondrivers/net/b44.c
- drivers/net/cxgb3/common.h 6 additions, 3 deletionsdrivers/net/cxgb3/common.h
- drivers/net/cxgb3/cxgb3_main.c 24 additions, 11 deletionsdrivers/net/cxgb3/cxgb3_main.c
- drivers/net/cxgb3/cxgb3_offload.c 3 additions, 1 deletiondrivers/net/cxgb3/cxgb3_offload.c
- drivers/net/cxgb3/mc5.c 3 additions, 0 deletionsdrivers/net/cxgb3/mc5.c
- drivers/net/cxgb3/regs.h 4 additions, 0 deletionsdrivers/net/cxgb3/regs.h
- drivers/net/cxgb3/sge.c 1 addition, 1 deletiondrivers/net/cxgb3/sge.c
- drivers/net/cxgb3/t3_hw.c 18 additions, 6 deletionsdrivers/net/cxgb3/t3_hw.c
- drivers/net/cxgb3/version.h 4 additions, 1 deletiondrivers/net/cxgb3/version.h
- drivers/net/cxgb3/xgmac.c 0 additions, 1 deletiondrivers/net/cxgb3/xgmac.c
- drivers/net/r8169.c 25 additions, 21 deletionsdrivers/net/r8169.c
Loading
Please register or sign in to comment