Merge HEAD from ../from-linus
[linux-2.6] / drivers / net / ibm_emac / ibm_emac_phy.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2