Merge branch 'cpuidle-fix' into fixes

author Tony Lindgren <[email protected]>

Fri, 15 Jan 2021 10:48:43 +0000 (12:48 +0200)

committer Tony Lindgren <[email protected]>

Fri, 15 Jan 2021 10:48:43 +0000 (12:48 +0200)
author Tony Lindgren <[email protected]>
Fri, 15 Jan 2021 10:48:43 +0000 (12:48 +0200)
committer Tony Lindgren <[email protected]>
Fri, 15 Jan 2021 10:48:43 +0000 (12:48 +0200)
diff --cc arch/arm/mach-omap2/omap_device.c
Simple merge
diff --cc drivers/soc/ti/omap_prm.c
Simple merge
author	Tony Lindgren <[email protected]>
	Fri, 15 Jan 2021 10:48:43 +0000 (12:48 +0200)
committer	Tony Lindgren <[email protected]>
	Fri, 15 Jan 2021 10:48:43 +0000 (12:48 +0200)
		1	2
arch/arm/mach-omap2/omap_device.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/soc/ti/omap_prm.c	patch \|	diff1 \|	diff2 \|	blob \| history