]> Git Repo - qemu.git/commit - hw/pc_piix.c
projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f530cce) | patch
pc/piix: fix mismerge of b1aeb92666d2fde413c34578b3b42bbfe5f2a506
authorIsaku Yamahata <[email protected]>
Wed, 22 Dec 2010 06:13:43 +0000 (15:13 +0900)
committerMichael S. Tsirkin <[email protected]>
Wed, 22 Dec 2010 07:00:07 +0000 (09:00 +0200)
commit362dd48c16728a656c1ef75f8160838127fd76d5
treec8e3e449ca97b4e6abc9e061ad7a957f8a704eb1tree | snapshot
parentf530cce3152b55a535e9e87610110fefa4e9c853commit | diff
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 <[email protected]>
Signed-off-by: Michael S. Tsirkin <[email protected]>
hw/pc_piix.c diff | blob | blame | history
Empty description
This page took 0.03277 seconds and 4 git commands to generate.