Merge branch 'linus' into sched/urgent
[linux-2.6] / arch / x86 / include / asm / cputime.h
1 #include <asm-generic/cputime.h>