| commit | d2516d31c32fe7c8a1dcebeba68eb534e74f8323 | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Sun, 4 Jul 2010 10:49:32 +0000 (4 07:49 -0300) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Sun, 4 Jul 2010 10:49:32 +0000 (4 07:49 -0300) | ||
| tree | e865aa216c8eaf002270cea202a544d16fe9c4e6 | treesnapshot (tar.gz zip) |
| parent | 231ba2cf0d8f0b835d0ea3618743444ec648021b | commitdiff |
| parent | ddced198cdb6e3c9f7d8b612fa1d22c51c36fa4a | commitdiff |
Merge commit 'ddced198cdb6e3c9f7d8b612fa1d22c51c36fa4a' into upstream-merge
* commit 'ddced198cdb6e3c9f7d8b612fa1d22c51c36fa4a':
kvm: init mp_state
Conflicts:
target-i386/kvm.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit 'ddced198cdb6e3c9f7d8b612fa1d22c51c36fa4a':
kvm: init mp_state
Conflicts:
target-i386/kvm.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| target-i386/kvm.c | diff1 | diff2 | blobhistory |