| commit | 0dd621a21d2870d6e15a7d12823528aaa397779a | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Wed, 20 Oct 2010 23:37:59 +0000 (20 21:37 -0200) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Wed, 20 Oct 2010 23:37:59 +0000 (20 21:37 -0200) | ||
| tree | 2bb0b08a5a998d5143531f3db8ba757b0810bb87 | treesnapshot (tar.gz zip) |
| parent | 57c2f8b056a0879236f6e55500eb6569c9a5e7f4 | commitdiff |
| parent | c0532a76b407af4b276dc5a62d8178db59857ea6 | commitdiff |
Merge commit 'c0532a76b407af4b276dc5a62d8178db59857ea6' into upstream-merge
* commit 'c0532a76b407af4b276dc5a62d8178db59857ea6':
MCE: Relay UCR MCE to guest
Conflicts:
kvm-stub.c
target-i386/kvm.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit 'c0532a76b407af4b276dc5a62d8178db59857ea6':
MCE: Relay UCR MCE to guest
Conflicts:
kvm-stub.c
target-i386/kvm.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>