Skip to content
Snippets Groups Projects
Commit b1730424 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/setup-lzma 

Conflicts:
	init/do_mounts_rd.c
parents 889c92d2 9a100a44
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1487 additions and 151 deletions
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