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)
commit715a1284d89a740b197b3bad5eb20d36a397382f
tree07ad2960ab66e56b3d1e151036262019a18e3df1
parent181739822cf6f8f4e12b173913af2967a28906c0
parent06862d789ddde8a99c1e579e934ca17c15a84755
Merge branch 'cpuidle-fix' into fixes
arch/arm/mach-omap2/omap_device.c
drivers/soc/ti/omap_prm.c