Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc6' into tracing/core
[linux-2.6] / arch / x86 / include / asm / string.h
1 #ifdef CONFIG_X86_32
2 # include "string_32.h"
3 #else
4 # include "string_64.h"
5 #endif