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: - cxgb3 engine microcode load cxgb3 - Fix dev->priv usage qeth: Drop ARP packages on HiperSockets interface with NOARP attribute. qeth: provide specific message for OSA-adapters exclusively used qeth: crash during reboot after failing online setting qeth: Announce tx checksumming for qeth devices in TSO/EDDP mode qeth: dont return the return values of void functions. qeth: enforce a rate limit for inbound scatter gather messages qeth: ungrouping a device must not be interruptible netxen: fix crashes during module unload netxen: Avoid firmware load in PCI probe PS3: fix the bug that 'ifconfig down' would hang IOC3: Program UART predividers.
Showing
- drivers/infiniband/hw/cxgb3/cxio_hal.c 1 addition, 1 deletiondrivers/infiniband/hw/cxgb3/cxio_hal.c
- drivers/net/cxgb3/adapter.h 2 additions, 0 deletionsdrivers/net/cxgb3/adapter.h
- drivers/net/cxgb3/common.h 2 additions, 1 deletiondrivers/net/cxgb3/common.h
- drivers/net/cxgb3/cxgb3_main.c 153 additions, 99 deletionsdrivers/net/cxgb3/cxgb3_main.c
- drivers/net/cxgb3/cxgb3_offload.c 13 additions, 3 deletionsdrivers/net/cxgb3/cxgb3_offload.c
- drivers/net/cxgb3/cxgb3_offload.h 2 additions, 0 deletionsdrivers/net/cxgb3/cxgb3_offload.h
- drivers/net/cxgb3/sge.c 15 additions, 8 deletionsdrivers/net/cxgb3/sge.c
- drivers/net/cxgb3/t3_hw.c 40 additions, 6 deletionsdrivers/net/cxgb3/t3_hw.c
- drivers/net/cxgb3/t3cdev.h 0 additions, 3 deletionsdrivers/net/cxgb3/t3cdev.h
- drivers/net/ioc3-eth.c 60 additions, 20 deletionsdrivers/net/ioc3-eth.c
- drivers/net/netxen/netxen_nic_hdr.h 4 additions, 2 deletionsdrivers/net/netxen/netxen_nic_hdr.h
- drivers/net/netxen/netxen_nic_hw.c 4 additions, 4 deletionsdrivers/net/netxen/netxen_nic_hw.c
- drivers/net/netxen/netxen_nic_main.c 7 additions, 12 deletionsdrivers/net/netxen/netxen_nic_main.c
- drivers/net/ps3_gelic_net.c 0 additions, 1 deletiondrivers/net/ps3_gelic_net.c
- drivers/s390/net/qeth.h 2 additions, 2 deletionsdrivers/s390/net/qeth.h
- drivers/s390/net/qeth_main.c 118 additions, 40 deletionsdrivers/s390/net/qeth_main.c
- drivers/s390/net/qeth_mpc.h 1 addition, 0 deletionsdrivers/s390/net/qeth_mpc.h
- drivers/s390/net/qeth_sys.c 4 additions, 4 deletionsdrivers/s390/net/qeth_sys.c
Loading
Please register or sign in to comment