merge by hand (qla_os.c mismerge)
[profile/ivi/kernel-adaptation-intel-automotive.git] / include / net / p8022.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2