diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2015-01-23 13:39:51 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-01-23 13:39:51 +0100 |
| commit | 1c6007d59a20762052cc92c0a2889ff11030d23a (patch) | |
| tree | 40bd72fe4e4d38a811312e5ae35bafd04c995d40 /tools/perf/scripts/python | |
| parent | Merge branch 'arm64/common-esr-macros' of git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux into kvm-next (diff) | |
| parent | KVM: Remove unused config symbol (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
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions