Merge branch 'master' into upstream
[linux-2.6] / include / asm-x86_64 / therm_throt.h
1 #include <asm-i386/therm_throt.h>