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:
  sky2: version 1.18
  sky2: receive FIFO checking
  sky2: fe+ chip support
  sky2: reorganize chip revision features
  sky2: ethtool speed report bug
  sky2: fix VLAN receive processing (resend)
  phy: export phy_mii_ioctl
  myri10ge: Add support for PCI device id 9

...

This commit is contained in:

Linus Torvalds 2007-09-20 12:42:23 -07:00

parent be7963b7e7 faf60e72d0

commit 460edb3cd0

4 changed files with 292 additions and 121 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

3

drivers/net/myri10ge/myri10ge.c

View file

1

drivers/net/phy/phy.c

View file

370

drivers/net/sky2.c

View file

41

drivers/net/sky2.h

View file