Merge tag 'pm+acpi-3.10-rc1' of git://git.kernel.org/pub/scm/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
  ...

3 files changed, 83 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-devices-lpss_ltr b/Documentation/ABI/testing/sysfs-devices-lpss_ltr
new file mode 100644
index 000000000000..ea9298d9bbaf
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-devices-lpss_ltr
@@ -0,0 +1,44 @@
+What:           /sys/devices/.../lpss_ltr/
+Date:           March 2013
+Contact:        Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Description:
+                The /sys/devices/.../lpss_ltr/ directory is only present for
+                devices included into the Intel Lynxpoint Low Power Subsystem
+                (LPSS).  If present, it contains attributes containing the LTR
+                mode and the values of LTR registers of the device.
+
+What:           /sys/devices/.../lpss_ltr/ltr_mode
+Date:           March 2013
+Contact:        Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Description:
+                The /sys/devices/.../lpss_ltr/ltr_mode attribute contains an
+                integer number (0 or 1) indicating whether or not the devices'
+                LTR functionality is working in the software mode (1).
+
+                This attribute is read-only.  If the device's runtime PM status
+                is not "active", attempts to read from this attribute cause
+                -EAGAIN to be returned.
+
+What:           /sys/devices/.../lpss_ltr/auto_ltr
+Date:           March 2013
+Contact:        Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Description:
+                The /sys/devices/.../lpss_ltr/auto_ltr attribute contains the
+                current value of the device's AUTO_LTR register (raw)
+                represented as an 8-digit hexadecimal number.
+
+                This attribute is read-only.  If the device's runtime PM status
+                is not "active", attempts to read from this attribute cause
+                -EAGAIN to be returned.
+
+What:           /sys/devices/.../lpss_ltr/sw_ltr
+Date:           March 2013
+Contact:        Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Description:
+                The /sys/devices/.../lpss_ltr/auto_ltr attribute contains the
+                current value of the device's SW_LTR register (raw) represented
+                as an 8-digit hexadecimal number.
+
+                This attribute is read-only.  If the device's runtime PM status
+                is not "active", attempts to read from this attribute cause
+                -EAGAIN to be returned.
diff --git a/Documentation/ABI/testing/sysfs-devices-power_resources_wakeup b/Documentation/ABI/testing/sysfs-devices-power_resources_wakeup
new file mode 100644
index 000000000000..e0588feeb6e1
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-devices-power_resources_wakeup
@@ -0,0 +1,13 @@
+What:           /sys/devices/.../power_resources_wakeup/
+Date:           April 2013
+Contact:        Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Description:
+                The /sys/devices/.../power_resources_wakeup/ directory is only
+                present for device objects representing ACPI device nodes that
+                require ACPI power resources for wakeup signaling.
+
+                If present, it contains symbolic links to device directories
+                representing ACPI power resources that need to be turned on for
+                the given device node to be able to signal wakeup.  The names of
+                the links are the same as the names of the directories they
+                point to.
diff --git a/Documentation/ABI/testing/sysfs-firmware-acpi b/Documentation/ABI/testing/sysfs-firmware-acpi
index dd930c8db41f..ce9bee98b43b 100644
--- a/Documentation/ABI/testing/sysfs-firmware-acpi
+++ b/Documentation/ABI/testing/sysfs-firmware-acpi
@@ -18,6 +18,32 @@ Description:
                 yoffset: The number of pixels between the top of the screen
                          and the top edge of the image.
 
+What:           /sys/firmware/acpi/hotplug/
+Date:           February 2013
+Contact:        Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Description:
+                There are separate hotplug profiles for different classes of
+                devices supported by ACPI, such as containers, memory modules,
+                processors, PCI root bridges etc.  A hotplug profile for a given
+                class of devices is a collection of settings defining the way
+                that class of devices will be handled by the ACPI core hotplug
+                code.  Those profiles are represented in sysfs as subdirectories
+                of /sys/firmware/acpi/hotplug/.
+
+                The following setting is available to user space for each
+                hotplug profile:
+
+                enabled: If set, the ACPI core will handle notifications of
+                        hotplug events associated with the given class of
+                        devices and will allow those devices to be ejected with
+                        the help of the _EJ0 control method.  Unsetting it
+                        effectively disables hotplug for the correspoinding
+                        class of devices.
+
+                The value of the above attribute is an integer number: 1 (set)
+                or 0 (unset).  Attempts to write any other values to it will
+                cause -EINVAL to be returned.
+
 What:           /sys/firmware/acpi/interrupts/
 Date:           February 2008
 Contact:        Len Brown <lenb@kernel.org>