]> xenbits.xensource.com Git - qemu-xen-4.0-testing.git/commit
Merge branch 'pt.multifn'
authorIan Jackson <ian.jackson@eu.citrix.com>
Thu, 25 Jun 2009 17:40:33 +0000 (18:40 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Thu, 25 Jun 2009 17:40:33 +0000 (18:40 +0100)
commitd67e46f6860bfbd8991b7691efc1f67b7bc413bc
treeaacc22d788c18fd4b1aaf257be49ac637962b966
parentf2e0a24d00b2f0c591719bab088fbe3654955066
parentaf79b97d1d25bf9412c8fe1ab099ba8674f109d0
Merge branch 'pt.multifn'

Conflicts:
hw/piix4acpi.c
hw/piix4acpi.c