]> 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>
Sat, 17 May 2008 21:21:43 +0000 (14:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 May 2008 21:21:43 +0000 (14:21 -0700)
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: disable mwait for AMD family 10H/11H CPUs
  x86: fix crash on cpu hotplug on pat-incapable machines
  x86: remove mwait capability C-state check


Trivial merge