Merge remote-tracking branch 'acpi/next'

Conflicts:
	drivers/pci/pci-acpi.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/acpi/ac.c
Simple merge

diff --cc drivers/acpi/battery.c
Simple merge

diff --cc drivers/acpi/processor_driver.c
Simple merge

diff --cc drivers/acpi/processor_idle.c
Simple merge

diff --cc drivers/acpi/scan.c
Simple merge

diff --cc drivers/acpi/sleep.c
Simple merge

diff --cc drivers/acpi/thermal.c
Simple merge

diff --cc drivers/cpuidle/cpuidle.c
Simple merge

diff --cc drivers/idle/intel_idle.c
Simple merge

diff --cc drivers/platform/x86/intel_mid_thermal.c
Simple merge

diff --cc include/acpi/acnames.h
Simple merge

diff --cc include/acpi/acpi_bus.h
Simple merge

diff --cc include/linux/cpuidle.h
Simple merge