summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mvebu
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2013-01-28 11:22:46 -0700
committerStephen Warren <swarren@nvidia.com>2013-01-28 11:22:46 -0700
commitee059485175b21079d3639f167980d354afb3d4b (patch)
tree30bf32ec57ba915d31348c1b603481baf42c81dd /arch/arm/mach-mvebu
parent1d328606c66b9bb1c0552f585943d596f37ae3b9 (diff)
parent80d9375617f7544f7475e7f07003a08930559d43 (diff)
Merge branch 'for-3.9/scu-base-rework' into for-3.9/soc-t114
Conflicts: arch/arm/mach-tegra/platsmp.c
Diffstat (limited to 'arch/arm/mach-mvebu')
0 files changed, 0 insertions, 0 deletions