Merge branch 'master' into for-next
[cascardo/linux.git] / arch / x86 / include / asm / string.h
1 #ifdef CONFIG_X86_32
2 # include <asm/string_32.h>
3 #else
4 # include <asm/string_64.h>
5 #endif