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

Merge c70055d8 ("Merge tag 'sched_urgent_for_v6.1_rc2' of... 

Merge c70055d8 ("Merge tag 'sched_urgent_for_v6.1_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip"

) into android-mainline

Steps on the way to 6.1-rc2

Resolves merge conflicts in:
	kernel/sched/sched.h

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I39fa84c56349cd6ae84e8420e921101afefebc64
parents eb24765d c70055d8
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment