Merge git://git.infradead.org/battery-2.6
[linux-2.6] / include / asm-arm / timex.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2