]> xenbits.xen.org Git - xenclient/ioemu-pq.git/commit
Fix conflicts on intel.c.
authorJean Guyader <jean.guyader@eu.citrix.com>
Tue, 26 May 2009 11:13:53 +0000 (12:13 +0100)
committerJean Guyader <jean.guyader@eu.citrix.com>
Tue, 26 May 2009 11:13:53 +0000 (12:13 +0100)
commit35692d4490e0c770f7c313a38c7c220be33167f5
treeeacb94c8d15db4981e131d76938d39be3ac96825
parent1f822748d43a54e74449129233b322a47e171e48
Fix conflicts on intel.c.
master/intel