From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Oct 2010 20:45:38 +0000 (-0700)
Subject: Merge branch 'x86-idle-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2a8b67fb72c4c4bc15fe8095e3ed613789c8b82f;p=openwrt%2Fstaging%2Fblogic.git

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

* 'x86-idle-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, hotplug: In the MWAIT case of play_dead, CLFLUSH the cache line
  x86, hotplug: Move WBINVD back outside the play_dead loop
  x86, hotplug: Use mwait to offline a processor, fix the legacy case
  x86, mwait: Move mwait constants to a common header file
---

2a8b67fb72c4c4bc15fe8095e3ed613789c8b82f
diff --cc drivers/idle/intel_idle.c
index c37ef64d1465,065c8041c911..cb3ccf3ed221
mode 100644,100755..100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c