Commit 109c3b55 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Treehugger Robot
Browse files

Merge 3f020399 ("Merge tag 'sched-core-2024-11-18' of... 

Merge 3f020399 ("Merge tag 'sched-core-2024-11-18' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip"

) into android-mainline

Steps on the way to 6.13-rc1

Resolves merge conflicts in:
	kernel/sched/rt.c

Change-Id: I307a3d70ec9fb81374f3c5cbe39048b0c2c9c903
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 5d1a9a9a 3f020399
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