]> git.baikalelectronics.ru Git - kernel.git/commit
Powerpc KVM work is based on a commit after rc4.
authorGleb Natapov <gleb@redhat.com>
Thu, 17 Oct 2013 14:04:47 +0000 (17:04 +0300)
committerGleb Natapov <gleb@redhat.com>
Thu, 17 Oct 2013 14:41:49 +0000 (17:41 +0300)
commit0df87f452bd2af0d067c844596cf2feb534abe1f
tree093c4311a737210bbdd3d1919f8193cb5f017241
parentc117ebeae2fab4f6acd8640c324c920da8ae812c
parent373a68d79e60c2369b1b5c9e270f2a02f734941d
Powerpc KVM work is based on a commit after rc4.

Merging master into next to satisfy the dependencies.

Conflicts:
arch/arm/kvm/reset.c
arch/arm/kvm/reset.c
arch/x86/kvm/vmx.c
virt/kvm/kvm_main.c