summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-27 09:04:43 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-27 09:04:43 +0100
commitf701d354075914296474d062f18fc8ee681a2318 (patch)
tree4c39db49f4bc9827a1a0dabc6a83fb30bd2c7ac4 /arch/x86/Kconfig
parentMerge branch 'sched/clock' into tracing/ftrace (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable (diff)
downloadlinux-f701d354075914296474d062f18fc8ee681a2318.tar.xz
linux-f701d354075914296474d062f18fc8ee681a2318.zip
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
Diffstat (limited to 'arch/x86/Kconfig')
0 files changed, 0 insertions, 0 deletions