Merge branch 'stable/vga.support' into stable/drivers

author Konrad Rzeszutek Wilk <[email protected]>

Tue, 21 Jun 2011 13:25:41 +0000 (09:25 -0400)

committer Konrad Rzeszutek Wilk <[email protected]>

Tue, 21 Jun 2011 13:25:41 +0000 (09:25 -0400)
author Konrad Rzeszutek Wilk <[email protected]>
Tue, 21 Jun 2011 13:25:41 +0000 (09:25 -0400)
committer Konrad Rzeszutek Wilk <[email protected]>
Tue, 21 Jun 2011 13:25:41 +0000 (09:25 -0400)
diff --cc arch/x86/xen/enlighten.c
Simple merge
diff --cc arch/x86/xen/xen-ops.h
Simple merge
diff --cc include/xen/interface/xen.h
Simple merge
author	Konrad Rzeszutek Wilk <[email protected]>
	Tue, 21 Jun 2011 13:25:41 +0000 (09:25 -0400)
committer	Konrad Rzeszutek Wilk <[email protected]>
	Tue, 21 Jun 2011 13:25:41 +0000 (09:25 -0400)
		1	2
arch/x86/xen/enlighten.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/xen-ops.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/xen/interface/xen.h	patch \|	diff1 \|	diff2 \|	blob \| history