Skip to content
Commit a875dafc authored by Christoffer Dall's avatar Christoffer Dall
Browse files

Merge remote-tracking branch 'kvm/next' into queue 

Conflicts:
	arch/arm64/include/asm/kvm_host.h
	virt/kvm/arm/vgic.c
parents 0ba09511 f51770ed
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment