Merge branch 'for-3.9/scu-base-rework' into for-3.9/soc-t114
authorStephen Warren <swarren@nvidia.com>
Mon, 28 Jan 2013 18:22:46 +0000 (11:22 -0700)
committerStephen Warren <swarren@nvidia.com>
Mon, 28 Jan 2013 18:22:46 +0000 (11:22 -0700)
commitee059485175b21079d3639f167980d354afb3d4b
tree30bf32ec57ba915d31348c1b603481baf42c81dd
parent1d328606c66b9bb1c0552f585943d596f37ae3b9
parent80d9375617f7544f7475e7f07003a08930559d43
Merge branch 'for-3.9/scu-base-rework' into for-3.9/soc-t114

Conflicts:
arch/arm/mach-tegra/platsmp.c
arch/arm/boot/dts/tegra20.dtsi
arch/arm/boot/dts/tegra30.dtsi
arch/arm/mach-tegra/platsmp.c