| commit | 460edb3cd06865ffb231eb694b567daec3113210 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Sep 20 12:42:23 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Sep 20 12:42:23 2007 -0700 |
| tree | 5822da2ced52195772c1edcda20a881855bd2398 | |
| parent | be7963b7e7f08a149e247c0bf29a4abd174e0929 [diff] | |
| parent | faf60e72d07d163a623e47269680918fccaa789a [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: 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