From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 25 Sep 2007 15:52:26 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v3.12-rc1~26830
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f3fe81d9c953adc627e26fdd4a9fbfe22cf67ef2;p=kernel%2Fkernel-generic.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:
  Revert "drivers/net/pcmcia/3c589_cs: fix port configuration switcheroo"
  sky2: be more selective about FIFO watchdog
  sky2: FE+ Phy initialization
  r8169: workaround against ignored TxPoll writes (8168)
  r8169: correct phy parameters for the 8110SC
---

f3fe81d9c953adc627e26fdd4a9fbfe22cf67ef2