| commit | fece3a0bcad6396742044f1e201d1132b1e0578b | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Mon, 14 Sep 2009 11:41:14 +0000 (14 08:41 -0300) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Mon, 14 Sep 2009 11:41:14 +0000 (14 08:41 -0300) | ||
| tree | 176d4033542463e981ce264a0ba81555360f5359 | treesnapshot (tar.gz zip) |
| parent | bb2eb3fe921ec87460ea116bd45dd9190ee2d575 | commitdiff |
| parent | 2637c754ccdb286890ed2a8d0d1da775dbd062af | commitdiff |
Merge commit '2637c754ccdb286890ed2a8d0d1da775dbd062af' into upstream-merge
* commit '2637c754ccdb286890ed2a8d0d1da775dbd062af':
kvm_arch_get_registers() shouldn't be called directly
vmstate: port cirrus_vga device
vmstate: port serial device
Conflicts:
target-i386/helper.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit '2637c754ccdb286890ed2a8d0d1da775dbd062af':
kvm_arch_get_registers() shouldn't be called directly
vmstate: port cirrus_vga device
vmstate: port serial device
Conflicts:
target-i386/helper.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| hw/cirrus_vga.c | diff1 | diff2 | blobhistory |
| target-i386/helper.c | diff1 | diff2 | blobhistory |