merge by hand (qla_os.c mismerge)
[linux-2.6-microblaze.git] / drivers / net / ne2k-pci.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2