Merge by hand (conflicts in sd.c)
[linux-2.6] / include / asm-m32r / timex.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2