Merge branches 'tracing/hw-branch-tracing' and 'tracing/branch-tracer' into tracing...
[linux-2.6] / include / linux / i8k.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2