Skip to content
Commit 13acfd57 authored by Gleb Natapov's avatar Gleb Natapov
Browse files

Powerpc KVM work is based on a commit after rc4. 

Merging master into next to satisfy the dependencies.

Conflicts:
	arch/arm/kvm/reset.c
parents d5701426 34ec4de4
Hide whitespace changes
Inline Side-by-side
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