Merge remote branch 'linus/master' into x86/bootmem
[sfrench/cifs-2.6.git] / arch / arm / include / asm / mach-types.h
1 #include <generated/mach-types.h>