From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 31 May 2011 17:07:22 +0000 (+0900)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.0-rc2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af0d6a0a3a30946f7df69c764791f1b0643f7cd6;p=pandora-kernel.git

Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix mwait_play_dead() faulting on mwait-incapable cpus
  x86 idle: Fix mwait deprecation warning message

Evil merge to remove extra quote noticed by Joe Perches
---

af0d6a0a3a30946f7df69c764791f1b0643f7cd6
Reading git-diff-tree failed