Merge branch 'intel_driver'

author Jean Guyader <jean.guyader@eu.citrix.com>

Tue, 4 Nov 2008 22:21:17 +0000 (22:21 +0000)

committer Jean Guyader <jean.guyader@eu.citrix.com>

Tue, 4 Nov 2008 22:21:17 +0000 (22:21 +0000)
author Jean Guyader <jean.guyader@eu.citrix.com>
Tue, 4 Nov 2008 22:21:17 +0000 (22:21 +0000)
committer Jean Guyader <jean.guyader@eu.citrix.com>
Tue, 4 Nov 2008 22:21:17 +0000 (22:21 +0000)
diff --cc vl.c
Simple merge
diff --cc xenstore.c
Simple merge
author	Jean Guyader <jean.guyader@eu.citrix.com>
	Tue, 4 Nov 2008 22:21:17 +0000 (22:21 +0000)
committer	Jean Guyader <jean.guyader@eu.citrix.com>
	Tue, 4 Nov 2008 22:21:17 +0000 (22:21 +0000)
		1	2
vl.c	patch \|	diff1 \|	diff2 \|	blob \| history
xenstore.c	patch \|	diff1 \|	diff2 \|	blob \| history