Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: disable X86_PTRACE_BTS

Changed files
+1
arch
+1
arch/x86/Kconfig.cpu
··· 520 520 bool "Branch Trace Store" 521 521 default y 522 522 depends on X86_DEBUGCTLMSR 523 + depends on BROKEN 523 524 help 524 525 This adds a ptrace interface to the hardware's branch trace store. 525 526