]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Dec 2008 18:24:14 +0000 (10:24 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Dec 2008 18:24:14 +0000 (10:24 -0800)
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: disable X86_PTRACE_BTS


Trivial merge