Merge branch 'for-3.9/scu-base-rework' into for-3.9/soc-t114

Conflicts:
	arch/arm/mach-tegra/platsmp.c
This commit is contained in:
Stephen Warren 2013-01-28 11:22:46 -07:00
commit ee05948517
12 changed files with 141 additions and 68 deletions