]> 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)
commitabc3dc69ecefa6b90019c4deb2e1fb61c56b55b4
tree093c4311a737210bbdd3d1919f8193cb5f017241
parented47a65044ea1b7eb0dc435b6c6e68511247a0b2
parentad2b75379d5cf920b6ddff283e9e217e26dc93fe
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