| commit | 1c6007d59a20762052cc92c0a2889ff11030d23a | [log] [tgz] |
|---|---|---|
| author | Paolo Bonzini <pbonzini@redhat.com> | Fri Jan 23 13:39:51 2015 +0100 |
| committer | Paolo Bonzini <pbonzini@redhat.com> | Fri Jan 23 13:39:51 2015 +0100 |
| tree | 40bd72fe4e4d38a811312e5ae35bafd04c995d40 | |
| parent | c6156df9d32141e5f1abb43078c56f2e5a0cb294 [diff] | |
| parent | 4b990589952f0e30aa860184ac6c76219a74632e [diff] |
Merge tag 'kvm-arm-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-next KVM/ARM changes for v3.20 including GICv3 emulation, dirty page logging, added trace symbols, and adding an explicit VGIC init device control IOCTL. Conflicts: arch/arm64/include/asm/kvm_arm.h arch/arm64/kvm/handle_exit.c