Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

Browse source

* '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

...

This commit is contained in:

Linus Torvalds 2007-09-25 08:52:26 -07:00

parent bbbd2bf00b 402c79fb19

commit f3fe81d9c9

4 changed files with 39 additions and 16 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/net/pcmcia/3c589_cs.c

View file

14

drivers/net/r8169.c

View file

37

drivers/net/sky2.c

View file

2

drivers/net/sky2.h

View file