Merge branch 'for-3.10/soc' into for-3.10/clk
commit8aa15d82df291b398d604b527a20310f10c1c706
authorStephen Warren <swarren@nvidia.com>
Thu, 4 Apr 2013 22:08:06 +0000 (4 16:08 -0600)
committerStephen Warren <swarren@nvidia.com>
Thu, 4 Apr 2013 22:08:06 +0000 (4 16:08 -0600)
tree2e72fa6d6cdcb62c63f31bbd0f15a28909db7625
parent8bb9660418e05bb1845ac1a2428444d78e322cc7
parent4d82d0587b4a964ea3a7c73aa044b433000527dd
Merge branch 'for-3.10/soc' into for-3.10/clk
arch/arm/Kconfig
arch/arm/boot/dts/tegra20.dtsi
arch/arm/boot/dts/tegra30.dtsi
drivers/clk/tegra/clk-tegra20.c