diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-14 20:10:49 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-14 20:10:49 +0100 |
commit | c1b8ae03c38281e442c2ad3725e921b09f23290a (patch) | |
tree | d12de54b9cb40f17905644a635c8cfec070707b7 /arch/arm/mach-pxa/em-x270.c | |
parent | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
parent | arm64: KVM: Add VGIC device control for arm64 (diff) | |
download | linux-c1b8ae03c38281e442c2ad3725e921b09f23290a.tar.xz linux-c1b8ae03c38281e442c2ad3725e921b09f23290a.zip |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fixes from Paolo Bonzini:
"A small error handling problem and a compile breakage for ARM64"
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
arm64: KVM: Add VGIC device control for arm64
KVM: return an error code in kvm_vm_ioctl_register_coalesced_mmio()
Diffstat (limited to 'arch/arm/mach-pxa/em-x270.c')
0 files changed, 0 insertions, 0 deletions