Skip to content
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
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