xserver: Branch 'master'

[Dave Airlie]

 hw/xfree86/common/xf86VGAarbiter.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 291408980f33b1e541c89d958535e6fad55fdac9
Author: Dave Airlie <airlied at linux.ie>
Date:   Wed Sep 2 20:14:30 2009 +1000

    vgaarb: protect fini as well just in case

diff --git a/hw/xfree86/common/xf86VGAarbiter.c b/hw/xfree86/common/xf86VGAarbiter.c
index f02ccf5..c389739 100644
--- a/hw/xfree86/common/xf86VGAarbiter.c
+++ b/hw/xfree86/common/xf86VGAarbiter.c
@@ -87,6 +87,8 @@ xf86VGAarbiterInit(void)
 void
 xf86VGAarbiterFini(void)
 {
+    if (vga_no_arb)
+	return;
     pci_device_vgaarb_fini();
 }