• Linus Torvalds's avatar
    Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 1f1c2881
    Linus Torvalds authored
    * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (37 commits)
      forcedeth bug fix: realtek phy
      forcedeth bug fix: vitesse phy
      forcedeth bug fix: cicada phy
      atl1: reorder atl1_main functions
      atl1: fix excessively indented code
      atl1: cleanup atl1_main
      atl1: header file cleanup
      atl1: remove irq_sem
      cdc-subset to support new vendor/product ID
      8139cp: implement the missing dev->tx_timeout
      myri10ge: Remove nonsensical limit in the tx done routine
      gianfar: kill unused header
      EP93XX_ETH must select MII
      macb: Add multicast capability
      macb: Use generic PHY layer
      s390: add barriers to qeth driver
      s390: scatter-gather for inbound traffic in qeth driver
      eHEA: Introducing support vor DLPAR memory add
      Fix a potential NULL pointer dereference in free_shared_mem() in drivers/net/s2io.c
      [PATCH] softmac: Fix ESSID problem
      ...
    1f1c2881
s2io.c 230 KB