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)
commit1806f826554efd206cebacc7f9f213c8e6493a5d
tree01544559b4aa44a1d85fabf5d20527c08f6f5cc9
parent2523659ded0cb261a3e1fda82fe7e4ddb6e86b6f
parent40f15ad8aadff5ebb621b17a6f303ad2cd3f847d
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