From: Stephen Warren <swarren@nvidia.com>
Date: Mon, 28 Jan 2013 18:22:46 +0000 (-0700)
Subject: Merge branch 'for-3.9/scu-base-rework' into for-3.9/soc-t114
X-Git-Tag: v3.9-rc1~118^2~12^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee059485175b21079d3639f167980d354afb3d4b;p=pandora-kernel.git

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

Conflicts:
	arch/arm/mach-tegra/platsmp.c
---

ee059485175b21079d3639f167980d354afb3d4b
Reading git-diff-tree failed