Skip to content
  • Linus Torvalds's avatar
    Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 065a3e17
    Linus Torvalds authored
    * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (33 commits)
      [PATCH] myri10ge - drop workaround pci_save_state() disabling MSI
      [PATCH] myri10ge - drop workaround for the missing AER ext cap on nVidia CK804
      via-velocity: the link is not correctly detected when the device starts
      [PATCH] add b44 to maintainers
      [PATCH] WAN: ioremap() failure checks in drivers
      [PATCH] WAN: register_hdlc_device() doesn't need dev_alloc_name()
      [PATCH] skb_padto()-area fixes in 8390, wavelan
      [PATCH] make drivers/net/forcedeth.c:nv_update_pause() static
      [PATCH] network driver for Hilscher netx
      [PATCH] Dereference in tokenring/olympic.c
      [PATCH] Array overrun in drivers/net/wireless/wavelan.c
      [PATCH] Remove useless check in drivers/net/pcmcia/xirc2ps_cs.c
      [PATCH] 8139cp: add ethtool eeprom support
      [PATCH] 8139cp: fix eeprom read command length
      [PATCH] b44: update b44 Kconfig entry
      [PATCH] b44: update version to 1.01
      [PATCH] b44: add wol for old nic
      [PATCH] b44: add parameter
      [PATCH] b44: add wol
      [PATCH] b44: fix manual speed/duplex/autoneg settings
      ...
    065a3e17