| commit | 2621769d211c0cd8e3353ba994b02840d2010e6f | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Wed, 22 Jun 2011 23:28:20 +0000 (22 20:28 -0300) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Wed, 22 Jun 2011 23:28:20 +0000 (22 20:28 -0300) | ||
| tree | ccd77179822985a024cf87f7c24c21ae120bbb58 | treesnapshot (tar.gz zip) |
| parent | c13a8909600d2f669482486669513ccded75eb27 | commitdiff |
| parent | 0bed3bba7d68b35e4b0c63d597b377c49a14e509 | commitdiff |
Merge commit '0bed3bba7d68b35e4b0c63d597b377c49a14e509' into upstream-merge
* commit '0bed3bba7d68b35e4b0c63d597b377c49a14e509':
kvm: ppc: Drop CONFIG_KVM_PPC_PVR
kvm: Drop CONFIG_KVM_PARA
Conflicts:
configure
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit '0bed3bba7d68b35e4b0c63d597b377c49a14e509':
kvm: ppc: Drop CONFIG_KVM_PPC_PVR
kvm: Drop CONFIG_KVM_PARA
Conflicts:
configure
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| configure | diff1 | diff2 | blobhistory |
| target-i386/kvm.c | diff1 | diff2 | blobhistory |