xserver: Branch 'master'

[Peter Hutterer]

 hw/xfree86/man/xorg.conf.man |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit e1ab8f239bdc6af17ef6cd0e9c6187c4e2e2f5bc
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Jul 31 11:35:44 2013 +1000

    xfree86/man: document AutoAddGPU
    
    This at least mentions AutoAddGPU and hints at when you might
    want to disable it.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index fa5b5fe..85f9f2e 100644
--- a/hw/xfree86/man/xorg.conf.man
+++ b/hw/xfree86/man/xorg.conf.man
@@ -668,6 +668,10 @@ DevicePresenceNotify event sent), but not enabled, thus leaving policy up
 to the client.
 Enabled by default.
 .TP 7
+.BI "Option \*qAutoAddGPU\*q \*q" boolean \*q
+If this option is disabled, then no GPU devices will be added from the udev
+backend. Enabled by default. (May need to be disabled to setup Xinerama).
+.TP 7
 .BI "Option \*qLog\*q \*q" string \*q
 This option controls whether the log is flushed and/or synced to disk after
 each message.