• Linus Torvalds's avatar
    Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 6c722e90
    Linus Torvalds authored
    * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (42 commits)
      r8169: extraneous Cmd{Tx/Rx}Enb write
      forcedeth: modified comment header
      NetXen: Reducing ring sizes for IOMMU issue.
      NetXen: Fix for PPC machines.
      NetXen: work queue fixes.
      NetXen: Link status message correction for quad port cards.
      NetXen: Multiple adapter fix.
      NetXen: Using correct CHECKSUM flag.
      NetXen: driver reload fix for newer firmware.
      NetXen: Adding new device ids.
      PHY probe not working properly for ibm_emac (PPC4xx)
      ep93xx: some minor cleanups to the ep93xx eth driver
      sky2: phy power down needs PCI config write enabled
      sky2: power management/MSI workaround
      sky2: dual port NAPI problem
      via-velocity uses INET interfaces
      e1000: Do not truncate TSO TCP header with 82544 workaround
      myri10ge: handle failures in suspend and resume
      myri10ge: no need to save MSI and PCIe state in the driver
      myri10ge: make msi configurable at runtime through sysfs
      ...
    6c722e90
netxen_nic_init.c 34.8 KB