Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
Loading
Showing
with 422 additions and 477 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment