Skip to content
  • Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · c010b2f7
    Linus Torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (82 commits)
      ipw2200: Call netif_*_queue() interfaces properly.
      netxen: Needs to include linux/vmalloc.h
      [netdrvr] atl1d: fix !CONFIG_PM build
      r6040: rework init_one error handling
      r6040: bump release number to 0.18
      r6040: handle RX fifo full and no descriptor interrupts
      r6040: change the default waiting time
      r6040: use definitions for magic values in descriptor status
      r6040: completely rework the RX path
      r6040: call napi_disable when puting down the interface and set lp->dev accordingly.
      mv643xx_eth: fix NETPOLL build
      r6040: rework the RX buffers allocation routine
      r6040: fix scheduling while atomic in r6040_tx_timeout
      r6040: fix null pointer access and tx timeouts
      r6040: prefix all functions with r6040
      rndis_host: support WM6 devices as modems
      at91_ether: use netstats in net_device structure
      sfc: Create one RX queue and interrupt per CPU package by default
      sfc: Use a separate workqueue for resets
      sfc: I2C adapter initialisation fixes
      ...
    c010b2f7