| commit | 362dd48c16728a656c1ef75f8160838127fd76d5 | |
| author | Isaku Yamahata <yamahata@valinux.co.jp> | |
| Wed, 22 Dec 2010 06:13:43 +0000 (22 15:13 +0900) | ||
| committer | Michael S. Tsirkin <mst@redhat.com> | |
| Wed, 22 Dec 2010 07:00:07 +0000 (22 09:00 +0200) | ||
| tree | c8e3e449ca97b4e6abc9e061ad7a957f8a704eb1 | treesnapshot (tar.gz zip) |
| parent | f530cce3152b55a535e9e87610110fefa4e9c853 | commitdiff |
pc/piix: fix mismerge of b1aeb92666d2fde413c34578b3b42bbfe5f2a506
The change set of b1aeb92666d2fde413c34578b3b42bbfe5f2a506 in pci branch
was mismerged. The compatibility should be kept for 0.13, not for 0.14.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
The change set of b1aeb92666d2fde413c34578b3b42bbfe5f2a506 in pci branch
was mismerged. The compatibility should be kept for 0.13, not for 0.14.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| hw/pc_piix.c | diffblobblamehistory |