Merge commit 'v2.6.27-rc3' into x86/prototypes
[linux-2.6] / include / linux / i8k.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2