Merge branch 'x86-idle-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Oct 2010 20:45:38 +0000 (13:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Oct 2010 20:45:38 +0000 (13:45 -0700)
commit2a8b67fb72c4c4bc15fe8095e3ed613789c8b82f
tree1dac291641bc5d0a3acff3d1e48b3328ae54462b
parentb6f7e38dbb310557fe890b04b1a376c93f638c3b
parentce5f68246bf2385d6174856708d0b746dc378f20
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
arch/x86/include/asm/processor.h
arch/x86/kernel/acpi/cstate.c
arch/x86/kernel/smpboot.c
drivers/acpi/acpi_pad.c
drivers/idle/intel_idle.c