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

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

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

diff --cc arch/arm64/configs/defconfig
Simple merge

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

diff --cc drivers/i2c/busses/i2c-designware-platdrv.c
Simple merge

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

diff --cc include/asm-generic/vmlinux.lds.h
Simple merge

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

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