| commit | d1dcf63406f0d9f17894589ba1eea46507431703 | |
| author | Avi Kivity <avi@redhat.com> | |
| Sun, 15 May 2011 09:31:29 +0000 (15 05:31 -0400) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Sun, 15 May 2011 09:31:29 +0000 (15 05:31 -0400) | ||
| tree | b264d2b46b59cec20ab22a3a676ff2986d21528d | treesnapshot (tar.gz zip) |
| parent | 669006fc5fddae824bae80400a3555058b9d91e9 | commitdiff |
| parent | 9c11a8ac886ccbb5f8e1b08e8ae12f045d783031 | commitdiff |
Merge commit '9c11a8ac886ccbb5f8e1b08e8ae12f045d783031' into upstream-merge
* commit '9c11a8ac886ccbb5f8e1b08e8ae12f045d783031':
xen: Introduce Xen Interrupt Controller
Conflicts:
hw/pc_piix.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '9c11a8ac886ccbb5f8e1b08e8ae12f045d783031':
xen: Introduce Xen Interrupt Controller
Conflicts:
hw/pc_piix.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/pc_piix.c | diff1 | diff2 | blobhistory |