tree 1903cb0a39ac1cade1940ccb559591cddf3660a0
parent 0ba09511ddc3ff0b462f37b4fe4b9c4dccc054ec
parent f51770ed465e6eb41da7fa16fd92eb67069600cf
author Christoffer Dall <christoffer.dall@linaro.org> 1411089332 -0700
committer Christoffer Dall <christoffer.dall@linaro.org> 1411089332 -0700

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

Conflicts:
	arch/arm64/include/asm/kvm_host.h
	virt/kvm/arm/vgic.c