diff options
author | Stephen Warren <swarren@nvidia.com> | 2013-01-28 11:22:46 -0700 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2013-01-28 11:22:46 -0700 |
commit | ee059485175b21079d3639f167980d354afb3d4b (patch) | |
tree | 30bf32ec57ba915d31348c1b603481baf42c81dd /arch/arm/mach-tegra/irammap.h | |
parent | ARM: tegra20: cpuidle: apply coupled cpuidle for powered-down mode (diff) | |
parent | ARM: OMAP: Make use of available scu_a9_get_base() interface (diff) | |
download | linux-dev-ee059485175b21079d3639f167980d354afb3d4b.tar.xz linux-dev-ee059485175b21079d3639f167980d354afb3d4b.zip |
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-tegra/irammap.h')
0 files changed, 0 insertions, 0 deletions