Merge ../linus
[powerpc.git] / arch / arm26 / lib / delay.S
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2