Merge branch 'linus' into timers/hpet
[linux-2.6] / arch / cris / arch-v10 / lib / hw_settings.S
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2