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)
Conflicts:
arch/arm/mach-tegra/platsmp.c


Trivial merge