projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d570142 34ec4de)
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)
commit13acfd5715144518232d8e29acf7c76ef1b089d8
tree093c4311a737210bbdd3d1919f8193cb5f017241tree | snapshot
parentd570142674890fe10b3d7d86aa105e3dfce1ddfacommit | diff
parent34ec4de42be5006abdd8d0c08b306ffaa64d0d5dcommit | diff
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 diff1 | diff2 | blob | history
arch/x86/kvm/vmx.c diff1 | diff2 | blob | history
virt/kvm/kvm_main.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.