From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 30 Apr 2013 22:21:02 +0000 (-0700)
Subject: Merge tag 'pm+acpi-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: firefly_0821_release~3680^2~629
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3ed1c478eff8db80e234d5446cb378b503135888;p=firefly-linux-kernel-4.4.55.git

Merge tag 'pm+acpi-3.10-rc1' of git://git./linux/kernel/git/rafael/linux-pm

Pull power management and ACPI updates from Rafael J Wysocki:

 - ARM big.LITTLE cpufreq driver from Viresh Kumar.

 - exynos5440 cpufreq driver from Amit Daniel Kachhap.

 - cpufreq core cleanup and code consolidation from Viresh Kumar and
   Stratos Karafotis.

 - cpufreq scalability improvement from Nathan Zimmer.

 - AMD "frequency sensitivity feedback" powersave bias for the ondemand
   cpufreq governor from Jacob Shin.

 - cpuidle code consolidation and cleanups from Daniel Lezcano.

 - ARM OMAP cpuidle fixes from Santosh Shilimkar and Daniel Lezcano.

 - ACPICA fixes and other improvements from Bob Moore, Jung-uk Kim, Lv
   Zheng, Yinghai Lu, Tang Chen, Colin Ian King, and Linn Crosetto.

 - ACPI core updates related to hotplug from Toshi Kani, Paul Bolle,
   Yasuaki Ishimatsu, and Rafael J Wysocki.

 - Intel Lynxpoint LPSS (Low-Power Subsystem) support improvements from
   Rafael J Wysocki and Andy Shevchenko.

* tag 'pm+acpi-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (192 commits)
  cpufreq: Revert incorrect commit 5800043
  cpufreq: MAINTAINERS: Add co-maintainer
  cpuidle: add maintainer entry
  ACPI / thermal: do not always return THERMAL_TREND_RAISING for active trip points
  ARM: s3c64xx: cpuidle: use init/exit common routine
  cpufreq: pxa2xx: initialize variables
  ACPI: video: correct acpi_video_bus_add error processing
  SH: cpuidle: use init/exit common routine
  ARM: S5pv210: compiling issue, ARM_S5PV210_CPUFREQ needs CONFIG_CPU_FREQ_TABLE=y
  ACPI: Fix wrong parameter passed to memblock_reserve
  cpuidle: fix comment format
  pnp: use %*phC to dump small buffers
  isapnp: remove debug leftovers
  ARM: imx: cpuidle: use init/exit common routine
  ARM: davinci: cpuidle: use init/exit common routine
  ARM: kirkwood: cpuidle: use init/exit common routine
  ARM: calxeda: cpuidle: use init/exit common routine
  ARM: tegra: cpuidle: use init/exit common routine for tegra3
  ARM: tegra: cpuidle: use init/exit common routine for tegra2
  ARM: OMAP4: cpuidle: use init/exit common routine
  ...
---

3ed1c478eff8db80e234d5446cb378b503135888
diff --cc drivers/acpi/scan.c
index f54d1985e594,d7f3c8b66fcf..fe158fd4f1df
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@ -1788,8 -2041,11 +2041,10 @@@ int __init acpi_scan_init(void
  	acpi_pci_root_init();
  	acpi_pci_link_init();
  	acpi_platform_init();
+ 	acpi_lpss_init();
  	acpi_csrt_init();
  	acpi_container_init();
 -	acpi_pci_slot_init();
+ 	acpi_memory_hotplug_init();
  
  	mutex_lock(&acpi_scan_lock);
  	/*
diff --cc include/linux/clockchips.h
index 464e229e7d84,f9fd93758333..963d71431388
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@@ -192,8 -181,7 +192,8 @@@ static inline void clockevents_notify(u
  static inline void clockevents_suspend(void) {}
  static inline void clockevents_resume(void) {}
  
- #define clockevents_notify(reason, arg) do { } while (0)
+ static inline void clockevents_notify(unsigned long reason, void *arg) {}
 +static inline int tick_check_broadcast_expired(void) { return 0; }
  
  #endif