Merge commit '900cfa46191a7d87cf1891924cb90499287fd235'; branches 'timers/nohz',...
[linux-2.6] / include / asm-arm / therm.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2