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)
commit08c18964a247b412acab56599a643e6f73e1ec5a
tree467a028ec1d1b351577216d3c2bf1d2d46e8d0c5
parent20a249896bb53536b69b228593dbdb6eb0d18113
parente9623b35599fcdbc00c16535cbefbb4d5578f4ab
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 mwait for AMD family 10H/11H CPUs
  x86: fix crash on cpu hotplug on pat-incapable machines
  x86: remove mwait capability C-state check