]> err.no Git - linux-2.6/commitdiff
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Jun 2008 15:56:57 +0000 (08:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Jun 2008 15:56:57 +0000 (08:56 -0700)
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  ptrace GET/SET FPXREGS broken
  x86: fix cpu hotplug crash
  x86: section/warning fixes
  x86: shift bits the right way in native_read_tscp


Trivial merge