Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit eaa4e4fc authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into sched/core, to resolve conflicts



Conflicts:
	kernel/sysctl.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents be1e4e76 5cb480f6
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment