Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  cpuidle: Single/Global registration of idle states
  cpuidle: Split cpuidle_state structure and move per-cpu statistics fields
  cpuidle: Remove CPUIDLE_FLAG_IGNORE and dev->prepare()
  cpuidle: Move dev->last_residency update to driver enter routine; remove dev->last_state
  ACPI: Fix CONFIG_ACPI_DOCK=n compiler warning
  ACPI: Export FADT pm_profile integer value to userspace
  thermal: Prevent polling from happening during system suspend
  ACPI: Drop ACPI_NO_HARDWARE_INIT
  ACPI atomicio: Convert width in bits to bytes in __acpi_ioremap_fast()
  PNPACPI: Simplify disabled resource registration
  ACPI: Fix possible recursive locking in hwregs.c
  ACPI: use kstrdup()
  mrst pmu: update comment
  tools/power turbostat: less verbose debugging

diff --cc arch/arm/mach-at91/cpuidle.c
Simple merge

diff --cc arch/arm/mach-davinci/cpuidle.c
Simple merge

diff --cc arch/arm/mach-exynos/cpuidle.c
Simple merge

diff --cc arch/arm/mach-kirkwood/cpuidle.c
Simple merge

diff --cc arch/sh/kernel/cpu/shmobile/cpuidle.c
Simple merge

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

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

diff --cc drivers/cpuidle/cpuidle.c
Simple merge

diff --cc drivers/cpuidle/governors/ladder.c
Simple merge

diff --cc drivers/cpuidle/governors/menu.c
Simple merge

diff --cc drivers/idle/intel_idle.c
Simple merge

diff --cc include/linux/cpuidle.h
index 583baf22cad20a6082b688d079dd24dd8aa3aa18,c90418822f4043b388b84c2b077b65b59a5fe2e1..7408af843b8ac891b1fd59557c5cb7faa117c0bd
--- 1/include/linux/cpuidle.h
--- 2/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@@ -20,9 -21,8 +20,10 @@@
  #define CPUIDLE_NAME_LEN      16
  #define CPUIDLE_DESC_LEN      32
  
 +struct module;
 +
  struct cpuidle_device;
+ struct cpuidle_driver;
  
  
  /****************************