Commit 075d0ec1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge c0842fbc ("random32: move the pseudo-random 32-bit definitions to...


Merge c0842fbc ("random32: move the pseudo-random 32-bit definitions to prandom.h") into android-mainline

Baby steps on the way to 5.9-rc1.

Resolves merge issues with:
	arch/arm64/boot/dts/qcom/sdm845-db845c.dts
	drivers/soc/qcom/Kconfig
	kernel/sched/cpufreq_schedutil.c

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ieb3344a22f9cf0d55ec5fc0daebe7602a248ab53
parents 00d6a8a7 c0842fbc
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment