Merge branch 'upstream'
[linux-2.6] / include / asm-i386 / mach-default / mach_time.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2