]> Git Repo - linux.git/commitdiff
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <[email protected]>
Tue, 25 Sep 2007 15:52:26 +0000 (08:52 -0700)
committerLinus Torvalds <[email protected]>
Tue, 25 Sep 2007 15:52:26 +0000 (08:52 -0700)
* '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


Trivial merge
This page took 0.052441 seconds and 4 git commands to generate.