merge by hand (qla_os.c mismerge)
[powerpc.git] / include / asm-arm26 / delay.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2