]> xenbits.xensource.com Git - xenclient/ioemu.git/commitdiff
Merge branch 'dom0_driver' into intel_driver
authorJean Guyader <jean.guyader@eu.citrix.com>
Tue, 21 Oct 2008 15:07:23 +0000 (16:07 +0100)
committerJean Guyader <jean.guyader@eu.citrix.com>
Tue, 21 Oct 2008 15:07:23 +0000 (16:07 +0100)
Conflicts:

dom0_driver.c


Trivial merge