www.infradead.org Git - linux-platform-drivers-x86.git/commit

author	Tony Lindgren <tony@atomide.com>
	Wed, 10 Mar 2021 12:19:20 +0000 (14:19 +0200)
committer	Tony Lindgren <tony@atomide.com>
	Wed, 10 Mar 2021 12:19:20 +0000 (14:19 +0200)
commit	569519de002fafde35f889a8ea0348eae6ccc20f
tree	f1b25190f115e3533cb1cb2f983907202a3d89a0	tree
parent	083516ad540a1104a0ae5ae7e83f2a2d8e39d2bc	commit \| diff
parent	54bc4edb3e52c3c7d1f715f3780977a0425626ad	commit \| diff
parent	2584d7e7f87ad0a57683dda8e7f17d8630c2eefc	commit \| diff
parent	229e1e1146e4f525725253fd7eeeabb07131ec8f	commit \| diff

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.

arch/arm/mach-omap2/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/arm/mach-omap2/Makefile	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/arm/mach-omap2/io.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history