Commit 30d31ef5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 268325bd ("Merge tag 'random-6.2-rc1-for-linus' of...

Merge 268325bd ("Merge tag 'random-6.2-rc1-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random"

) into android-mainline

Steps on the way to 6.2-rc1

Resolves conflicts in:
	kernel/fork.c

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