Merge remote-tracking branch 'imx-mxs/for-next'

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/configs/multi_v7_defconfig
index 27dca042208ebe1408bff6bc12d504d7d4317d11,7db8dce3da5f3025d60296da5f777974a0d4def5..ad53b85133eee2b41892b2b7305b34b97adf72bc
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -136,7 -135,8 +136,8 @@@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=
  CONFIG_CPU_FREQ_GOV_POWERSAVE=m
  CONFIG_CPU_FREQ_GOV_USERSPACE=m
  CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 -CONFIG_CPU_FREQ_GOV_SCHEDUTIL=m
 +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+ CONFIG_ARM_IMX6Q_CPUFREQ=y
  CONFIG_QORIQ_CPUFREQ=y
  CONFIG_CPU_IDLE=y
  CONFIG_ARM_CPUIDLE=y

diff --cc arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
Simple merge