]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bbbd2bf 402c79f)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 25 Sep 2007 15:52:26 +0000 (08:52 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 25 Sep 2007 15:52:26 +0000 (08:52 -0700)
commitf3fe81d9c953adc627e26fdd4a9fbfe22cf67ef2
tree3f13686733c69345bf364fb737dd2a66c39555ddtree | snapshot
parentbbbd2bf00bab467cff7b1f418b2cb24c71291f59commit | diff
parent402c79fb1944c8e003a32d07f31504b769fe2b52commit | diff
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:
  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
Linux 2.6 source tree