Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
[powerpc.git] / include / asm-m68knommu / timex.h
1 #include <asm-m68k/timex.h>