Merge branch 'stable/vga.support' into stable/drivers
commitf7fdd84e04c8fdc9196abe3bfd27535bccb52ee5
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 21 Jun 2011 13:25:41 +0000 (21 09:25 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 21 Jun 2011 13:25:41 +0000 (21 09:25 -0400)
tree648238ca42c83a4dadf2ea436fd5a6c061c8404b
parent03dc6107ff485995d356cb8a77766920e2eee21e
parentc2419b4a4727f67af2fc2cd68b0d878b75e781bb
Merge branch 'stable/vga.support' into stable/drivers

* stable/vga.support:
  xen: allow enable use of VGA console on dom0
arch/x86/xen/enlighten.c
arch/x86/xen/xen-ops.h
include/xen/interface/xen.h