| commit | f3fe81d9c953adc627e26fdd4a9fbfe22cf67ef2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Sep 25 08:52:26 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Sep 25 08:52:26 2007 -0700 |
| tree | 3f13686733c69345bf364fb737dd2a66c39555dd | |
| parent | bbbd2bf00bab467cff7b1f418b2cb24c71291f59 [diff] | |
| parent | 402c79fb1944c8e003a32d07f31504b769fe2b52 [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