Merge branches 'tracing/ftrace' and 'linus' into tracing/core
[linux-2.6] / arch / x86 / configs /
drwxr-xr-x   ..
-rw-r--r-- 63677 i386_defconfig
-rw-r--r-- 62758 x86_64_defconfig