From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 24 Dec 2008 18:24:14 +0000 (-0800)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.12-rc1~16892
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1806f826554efd206cebacc7f9f213c8e6493a5d;p=kernel%2Fkernel-generic.git

Merge branch 'x86-fixes-for-linus' of git://git./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
---

1806f826554efd206cebacc7f9f213c8e6493a5d