Merge tag 'pm+acpi-3.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 26 May 2013 03:32:00 +0000 (20:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 26 May 2013 03:32:00 +0000 (20:32 -0700)
Pull power management and ACPI fixes from Rafael Wysocki:

 - Additional CPU ID for the intel_pstate driver from Dirk Brandewie.

 - More cpufreq fixes related to ARM big.LITTLE support and locking from
   Viresh Kumar.

 - VIA C7 cpufreq build fix from RafaƂ Bilski.

 - ACPI power management fix making it possible to use device power
   states regardless of the CONFIG_PM setting from Rafael J Wysocki.

 - New ACPI video blacklist item from Bastian Triller.

* tag 'pm+acpi-3.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / video: Add "Asus UL30A" to ACPI video detect blacklist
  cpufreq: arm_big_little_dt: Instantiate as platform_driver
  cpufreq: arm_big_little_dt: Register driver only if DT has valid data
  cpufreq / e_powersaver: Fix linker error when ACPI processor is a module
  cpufreq / intel_pstate: Add additional supported CPU ID
  cpufreq: Drop rwsem lock around CPUFREQ_GOV_POLICY_EXIT
  ACPI / PM: Allow device power states to be used for CONFIG_PM unset

1  2 
drivers/acpi/Makefile

diff --combined drivers/acpi/Makefile
index 6050c8028dcef646490836c1e2a7116616df204f,7cad994ee44fd3112b4af7da64680116495749fa..536562c626a2fab4bb20c128abcf27f4404ca23f
@@@ -24,7 -24,7 +24,7 @@@ acpi-y                                += nvs.
  # Power management related files
  acpi-y                                += wakeup.o
  acpi-y                                += sleep.o
- acpi-$(CONFIG_PM)             += device_pm.o
+ acpi-y                                += device_pm.o
  acpi-$(CONFIG_ACPI_SLEEP)     += proc.o
  
  
@@@ -38,6 -38,7 +38,6 @@@ acpi-y                                += processor_core.
  acpi-y                                += ec.o
  acpi-$(CONFIG_ACPI_DOCK)      += dock.o
  acpi-y                                += pci_root.o pci_link.o pci_irq.o
 -acpi-y                                += csrt.o
  acpi-$(CONFIG_X86_INTEL_LPSS) += acpi_lpss.o
  acpi-y                                += acpi_platform.o
  acpi-y                                += power.o