From: Linus Torvalds 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: v2.6.28~2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1806f826554efd206cebacc7f9f213c8e6493a5d;p=linux-2.6-omap-h63xx.git 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 --- 1806f826554efd206cebacc7f9f213c8e6493a5d