From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 25 Aug 2007 14:59:59 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: MMI-PSA29.97-13-9~40649
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=36373b4450105ec8908c6c9396c8715eaafcfd6a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'upstream-linus' of /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
---

36373b4450105ec8908c6c9396c8715eaafcfd6a