diff options
| author | Tony Lindgren <tony@atomide.com> | 2021-03-10 14:19:20 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2021-03-10 14:19:20 +0200 |
| commit | 569519de002fafde35f889a8ea0348eae6ccc20f (patch) | |
| tree | f1b25190f115e3533cb1cb2f983907202a3d89a0 /arch/arm/mach-omap2/Kconfig | |
| parent | 083516ad540a1104a0ae5ae7e83f2a2d8e39d2bc (diff) | |
| parent | 54bc4edb3e52c3c7d1f715f3780977a0425626ad (diff) | |
| parent | 2584d7e7f87ad0a57683dda8e7f17d8630c2eefc (diff) | |
| parent | 229e1e1146e4f525725253fd7eeeabb07131ec8f (diff) | |
| download | linux-569519de002fafde35f889a8ea0348eae6ccc20f.tar.bz2 | |
Merge branches 'omap-for-v5.13/genpd-dra7', 'omap-for-v5.13/genpd-omap4' and 'omap-for-v5.13/genpd-omap5' into omap-for-v5.13/genpd-drop-legacy
Merge together branches dropping legacy data to avoid a minor merge conflict.