Merge branch 'for-3.10/dt' into for-next

diff --cc arch/arm/boot/dts/tegra114.dtsi
index e4ddeddcd437459f70faa3787aa28f13b4f926e1,61745675857c0c7b69456c0c6f789faadb8afe2b..5302044c1ca97ec62969bb68368b42661a9bba1f
--- 1/arch/arm/boot/dts/tegra114.dtsi
--- 2/arch/arm/boot/dts/tegra114.dtsi
+++ b/arch/arm/boot/dts/tegra114.dtsi
@@@ -98,8 -290,16 +290,16 @@@
                interrupts = <0 2 0x04>;
        };
  
+       kbc {
+               compatible = "nvidia,tegra114-kbc";
+               reg = <0x7000e200 0x100>;
+               interrupts = <0 85 0x04>;
+               clocks = <&tegra_car 36>;
+               status = "disabled";
+       };
+ 
        pmc {
 -              compatible = "nvidia,tegra114-pmc", "nvidia,tegra30-pmc";
 +              compatible = "nvidia,tegra114-pmc";
                reg = <0x7000e400 0x400>;
        };
  

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

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