Automatic merge of 'misc-fixes' branch from
[linux-2.6] / include / asm-sh / timex.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2