• Linus Torvalds's avatar
    Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · ce270020
    Linus Torvalds authored
    * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (52 commits)
      netxen: do_rom_fast_write error handling
      natsemi: Fix detection of vanilla natsemi cards
      net: remove a collection of unneeded #undef REALLY_SLOW_IO stuff
      chelsio: Fix non-NAPI compile
      cxgb3 - Feed Rx free list with pages
      cxgb3 - Recovery from HW starvation of response queue entries.
      cxgb3 - Unmap offload packets when they are freed
      cxgb3 - FW version update
      cxgb3 - private ioctl cleanup
      cxgb3 - manage sysfs attributes per port
      S2IO: Restoring the mac address in s2io_reset
      S2IO: Avoid printing the Enhanced statistics for Xframe I card.
      S2IO: Making LED off during LINK_DOWN notification.
      S2IO: Added a loadable parameter to enable or disable vlan stripping in frame.
      S2IO: Optimized the delay to wait for command completion
      S2IO: Fixes for MSI and MSIX
      qla3xxx: Bumping driver version n...
    ce270020
MAINTAINERS 82 KB