Merge remote-tracking branch 'pm/linux-next'

diff --cc arch/arm/mach-exynos/common.c
Simple merge

diff --cc arch/arm/mach-exynos/common.h
Simple merge

diff --cc arch/arm/mach-exynos/cpuidle.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-exynos5-dt.c
Simple merge

diff --cc arch/ia64/kernel/acpi.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/processor_idle.c
Simple merge

diff --cc arch/x86/kernel/acpi/boot.c
Simple merge

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

diff --cc drivers/cpufreq/exynos5250-cpufreq.c
Simple merge

diff --cc drivers/hid/i2c-hid/i2c-hid.c
Simple merge

diff --cc drivers/pci/hotplug/acpiphp_glue.c
Simple merge

diff --cc drivers/pci/hotplug/pciehp.h
Simple merge

diff --cc drivers/pci/ioapic.c
Simple merge

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

diff --cc drivers/pci/pci-label.c
Simple merge

diff --cc drivers/platform/x86/asus-wmi.c
Simple merge

diff --cc drivers/platform/x86/eeepc-laptop.c
Simple merge