Merge branch 'topic/vmaster-update' into topic/docbook-fix
[linux-2.6] / arch / x86 / include / asm / cputime.h
1 #include <asm-generic/cputime.h>