Merge branch 'upstream'
[powerpc.git] / arch / m68knommu / lib / delay.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2