diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-28 11:45:12 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-28 11:45:12 -0700 |
commit | 0471448f4d017470995d8a2272dc8c06dbed3b77 (patch) | |
tree | 39fd1a0ad4004052b9d7de0fbf57105af0da47bb /drivers/net/e1000 | |
parent | edd5cd4a9424f22b0fa08bef5e299d41befd5622 (diff) | |
parent | 5f708dd91d15876e26d7a57f97a255cedffca463 (diff) |
Merge branch 'for_linus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
* 'for_linus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc:
phy: Fix phy_id for Vitesse 824x PHY
Diffstat (limited to 'drivers/net/e1000')
0 files changed, 0 insertions, 0 deletions