xserver: Branch 'master'

[Martin-Éric Racine]

 hw/xfree86/common/xf86AutoConfig.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 09f0ee1324b046f2830bdd260f6e2a67ee8f2973
Author: Martin-Éric Racine <q-funk at iki.fi>
Date:   Fri Sep 4 04:17:09 2009 +0300

    Formatted recent Geode PCI ID changes to fit a 80-column coding style.

diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index 468c8b5..b3c31fd 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -156,12 +156,13 @@ videoPtrToDriverList(struct pci_device *dev,
 	    if (dev->device_id == 0x2081)
 		driverList[0] = "geode";
 	    break;
-	/* older Geode products acquired by AMD but still carrying an NSC vendor_id */
+	/* older Geode products acquired by AMD still carry an NSC vendor_id */
 	case 0x100B:
 	    if (dev->device_id == 0x0030) {
 		/* NSC Geode GX2 specifically ... */
 		driverList[0] = "geode";
-		/* GX2 support started in NSC and was later forked by AMD for GEODE so we keep it as a backup */
+		/* GX2 support started its life in the NSC tree and was later 
+		   forked by AMD for GEODE so we keep it as a backup */
 		driverList[1] = "nsc";
 	    } else 
 		/* ... or any other NSC Geode e.g. SC series */