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

Conflicts:
	arch/arm/mach-imx/mach-imx6q.c

diff --cc arch/arm/Kconfig.debug
Simple merge

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

diff --cc arch/arm/boot/dts/imx23.dtsi
Simple merge

diff --cc arch/arm/boot/dts/imx28-evk.dts
index aa33393903a87cec3bcef3bb7f5138a779230d96,1f63845b8ce08c3cc23aaeff334d9ee02b56e45e..4267c2b05d600ac8bfb9cf2612a3b72977d7dc0e
--- 1/arch/arm/boot/dts/imx28-evk.dts
--- 2/arch/arm/boot/dts/imx28-evk.dts
+++ b/arch/arm/boot/dts/imx28-evk.dts
@@@ -182,11 -182,8 +182,12 @@@
                        };
  
                        lradc@80050000 {
+                               fsl,lradc-touchscreen-wires = <4>;
                                status = "okay";
 +                              fsl,lradc-touchscreen-wires = <4>;
 +                              fsl,ave-ctrl = <4>;
 +                              fsl,ave-delay = <2>;
 +                              fsl,settling = <10>;
                        };
  
                        i2c0: i2c@80058000 {

diff --cc arch/arm/boot/dts/imx28.dtsi
Simple merge

diff --cc arch/arm/mach-imx/Kconfig
Simple merge

diff --cc arch/arm/mach-imx/mach-imx6q.c
index eae56423f0aeebf0c8ad82a698d6f4684b4238f7,1ac719d3f568e1cc8a4ab03b4577226fc82fb517..170f13f7215784e2aa2d35e433d92c7586bf9d01
--- 1/arch/arm/mach-imx/mach-imx6q.c
--- 2/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@@ -23,8 -23,9 +23,9 @@@
  #include <linux/of_address.h>
  #include <linux/of_irq.h>
  #include <linux/of_platform.h>
- #include <linux/pm_opp.h>
 -#include <linux/opp.h>
+ #include <linux/pci.h>
  #include <linux/phy.h>
++#include <linux/pm_opp.h>
  #include <linux/reboot.h>
  #include <linux/regmap.h>
  #include <linux/micrel_phy.h>

diff --cc arch/arm/mach-imx/mach-pcm037.c
Simple merge

diff --cc include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
Simple merge