diff options
| author | Tony Lindgren <tony@atomide.com> | 2021-03-10 13:19:20 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2021-03-10 13:19:20 +0100 |
| commit | 569519de002fafde35f889a8ea0348eae6ccc20f (patch) | |
| tree | f1b25190f115e3533cb1cb2f983907202a3d89a0 /arch/arm/mach-omap2/Makefile | |
| parent | Merge tags 'genpd-dts-dra7', 'genpd-dts-omap4' and 'genpd-dts-omap5' into oma... (diff) | |
| parent | ARM: OMAP2+: Drop legacy platform data for dra7 hwmod (diff) | |
| parent | ARM: OMAP2+: Drop legacy platform data for omap4 hwmod (diff) | |
| parent | ARM: OMAP2+: Drop legacy platform data for omap5 hwmod (diff) | |
| download | linux-569519de002fafde35f889a8ea0348eae6ccc20f.tar.xz linux-569519de002fafde35f889a8ea0348eae6ccc20f.zip | |
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.