Skip to content
GitLab
Commit 9e4144ab authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into core/printk 



Conflicts:

	kernel/printk.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents e17ba73b 6329d302
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment