merge by hand (qla_os.c mismerge)
[powerpc.git] / arch / arm / mach-integrator / clock.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2