xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/ddc/print_edid.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3d17c4f6e1538986fe7b1f17614d76e28f2d1e11
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Aug 28 12:12:52 2009 -0400

    EDID: Vendor detailed blocks aren't worth X_WARNING about

diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c
index 85c67d7..ff0b39c 100644
--- a/hw/xfree86/ddc/print_edid.c
+++ b/hw/xfree86/ddc/print_edid.c
@@ -450,7 +450,7 @@ print_detailed_monitor_section(int scrnIndex,
 	    break;
 	}
 	if (m[i].type >= DS_VENDOR && m[i].type <= DS_VENDOR_MAX) {
-	    xf86DrvMsg(scrnIndex, X_WARNING,
+	    xf86DrvMsg(scrnIndex, X_INFO,
 		       "Unknown vendor-specific block %hx\n",
 		       m[i].type - DS_VENDOR);
 	}