merge by hand (fix up qla_os.c merge error)
[firefly-linux-kernel-4.4.55.git] / arch / m68knommu / defconfig
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2