Merge branch 'x86/core' into x86/cleanups
[linux-2.6] / arch / m68knommu / include / asm / types.h
1 #include <asm-m68k/types.h>