commit 19e805cb040a81dcfbcf2aa8dbe5d9454c5faf2d
author Linus Torvalds <torvalds@woody.linux-foundation.org> Mon Jan 22 11:31:11 2007 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Mon Jan 22 11:31:11 2007 -0800
tree e5f75873ebe7a019ce6b2bd493031d8fcf7fcf00
parent ab1127823b757ec945a048c3385eb1f99a459823
parent 7939aae0c08412138a827e0af6f16fc19c346353

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  sis190: failure to set the MAC address from EEPROM
  Fix phy_read/write redefinition errors in ucc_geth_phy.c
  Update ucc_geth.c for new workqueue structure
  myri10ge: update driver version to 1.2.0
  myri10ge: check that we can get an irq
  myri10ge: make wc_fifo usage load-time tunable
  8139cp: Don't blindly enable interrupts
  [PATCH] bcm43xx: Fix failure to deliver PCI-E interrupts