From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 7 Nov 2011 18:13:52 +0000 (-0800)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
X-Git-Tag: v3.2-rc1~10
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=3c00303206c3a1ccd86579efdc90bc35f140962e

Merge branch 'release' of git://git./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
---

3c00303206c3a1ccd86579efdc90bc35f140962e
diff --cc include/linux/cpuidle.h
index 583baf22cad2,c90418822f40..7408af843b8a
--- a/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;
  
  
  /****************************