tree bbac0eab8d2d2b0d39e86092825d35fdf2d5ec40
parent 0b887d037bf4b76eec1c960e5feecd6a5a806971
parent 2972863768cc2ef94734abb22dec6a46b0891307
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1188053999 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1188053999 -0700

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:
  myri10ge: update driver version to 1.3.2-1.269
  myri10ge: use pcie_get/set_readrq
  ehea: fix queue destructor
  ehea: fix module parameter description
  ehea: fix interface to DLPAR tools
  sgiseeq: Fix return type of sgiseeq_remove
  sky2 1.17
  sky2: only bring up watchdog if link is active
  sky2: clear PCI power control reg at startup
  DM9000: fix interface hang under load
  phy layer: fix genphy_setup_forced (don't reset)
  Don't use GFP_DMA for zone allocation.
  fix realtek phy id in forcedeth