| commit | ee059485175b21079d3639f167980d354afb3d4b | [log] [tgz] |
|---|---|---|
| author | Stephen Warren <swarren@nvidia.com> | Mon Jan 28 11:22:46 2013 -0700 |
| committer | Stephen Warren <swarren@nvidia.com> | Mon Jan 28 11:22:46 2013 -0700 |
| tree | 30bf32ec57ba915d31348c1b603481baf42c81dd | |
| parent | 1d328606c66b9bb1c0552f585943d596f37ae3b9 [diff] | |
| parent | 80d9375617f7544f7475e7f07003a08930559d43 [diff] |
Merge branch 'for-3.9/scu-base-rework' into for-3.9/soc-t114 Conflicts: arch/arm/mach-tegra/platsmp.c