Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[linux-2.6] / arch / x86 / include / asm / cputime.h
1 #include <asm-generic/cputime.h>