Merge branch 'master' into for_paulus
[linux-2.6] / include / asm-sh / cpu-sh2a / timer.h
1 #include <asm/cpu-sh2/timer.h>