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

Merge branch 'linus' into tracing-v28-for-linus-v3

Conflicts:
	init/main.c
	kernel/module.c
	scripts/bootgraph.pl
parents 98d9c66a 0cfd8103
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment