Merge branch 'linus' into perfcounters/core-v2
[pandora-kernel.git] / arch / x86 / include / asm / cputime.h
1 #include <asm-generic/cputime.h>