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: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=af0d6a0a3a30946f7df69c764791f1b0643f7cd6;p=linux.git

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/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
diff --cc arch/x86/kernel/process.c
index 426a5b66f7e4,3d83a71af7d5..2e4928d45a2d
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@@ -642,7 -642,7 +642,7 @@@ static int __init idle_setup(char *str
  		boot_option_idle_override = IDLE_POLL;
  	} else if (!strcmp(str, "mwait")) {
  		boot_option_idle_override = IDLE_FORCE_MWAIT;
- 		WARN_ONCE(1, "\idle=mwait\" will be removed in 2012\"\n");
 -		WARN_ONCE(1, "\"idle=mwait\" will be removed in 2012\"\n");
++		WARN_ONCE(1, "\"idle=mwait\" will be removed in 2012\n");
  	} else if (!strcmp(str, "halt")) {
  		/*
  		 * When the boot option of idle=halt is added, halt is