Merge branch 'cpuidle-fix' into fixes
authorTony Lindgren <tony@atomide.com>
Fri, 15 Jan 2021 10:48:43 +0000 (12:48 +0200)
committerTony Lindgren <tony@atomide.com>
Fri, 15 Jan 2021 10:48:43 +0000 (12:48 +0200)
1  2 
arch/arm/mach-omap2/omap_device.c
drivers/soc/ti/omap_prm.c

Simple merge
Simple merge