Merge branch 'x86-idle-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* '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

diff --cc arch/x86/include/asm/processor.h
Simple merge

diff --cc arch/x86/kernel/acpi/cstate.c
Simple merge

diff --cc arch/x86/kernel/smpboot.c
Simple merge

diff --cc drivers/acpi/acpi_pad.c
Simple merge

diff --cc drivers/idle/intel_idle.c
index c37ef64d1465a7dac9bcab420699ba2d2b349138,065c8041c911f22b43b474a8b907484891796d91..cb3ccf3ed221ecef98c996fc50206b17ba1f1c1a
mode 100644,100755..100644
--- 1/drivers/idle/intel_idle.c
--- 2/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c