Merge branch 'linus' into x86/nmi
[linux-2.6] / arch / v850 / kernel / highres_timer.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2