Merge branch 'acpi-dev-pm' into acpi-enumeration

Documentation/ABI/testing/sysfs-devices-power

Documentation/power/pm_qos_interface.txt

drivers/acpi/Makefile

drivers/acpi/bus.c

drivers/acpi/device_pm.c

drivers/acpi/scan.c

drivers/acpi/sleep.c

drivers/base/power/domain.c

drivers/base/power/power.h

drivers/base/power/qos.c

drivers/base/power/sysfs.c

drivers/mtd/nand/sh_flctl.c

drivers/pci/pci-acpi.c

include/acpi/acpi_bus.h

include/linux/acpi.h

include/linux/pm.h

include/linux/pm_qos.h

kernel/power/qos.c