From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 17 May 2008 21:21:43 +0000 (-0700)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.26-rc3~21
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=08c18964a247b412acab56599a643e6f73e1ec5a;p=linux-2.6-omap-h63xx.git

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/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
---

08c18964a247b412acab56599a643e6f73e1ec5a