Merge branch 'master' into upstream
[linux-2.6/kmemtrace.git] / include / asm-m68knommu / timex.h
blob85069998db528d287df012b015a9c6ba1e55c1a7
1 #include <asm-m68k/timex.h>