reverted:
--- mesa-7.6.0/.gitattributes
+++ mesa-7.6.0.orig/.gitattributes
@@ -1,4 +0,0 @@
-*.dsp -crlf
-*.dsw -crlf
-*.sln -crlf
-*.vcproj -crlf
diff -u mesa-7.6.0/debian/changelog mesa-7.6.0/debian/changelog
--- mesa-7.6.0/debian/changelog
+++ mesa-7.6.0/debian/changelog
@@ -1,3 +1,12 @@
+mesa (7.6.0-1ubuntu4.1) karmic; urgency=low
+
+  * Add 111_b43_id_update.patch: Fixes detection of a new b43
+    chipset revision that is being shipped. Without this the drivers
+    will not attempt to load even though this chipset is the same as
+    the previous b43 ones. (LP: #640214)
+
+ -- Robert Hooker <robert.hooker@canonical.com>  Wed, 20 Oct 2010 09:38:12 -0400
+
 mesa (7.6.0-1ubuntu4) karmic; urgency=low
   
   * Add 110_dont_free.patch: It is not necessary to worry about freeing
diff -u mesa-7.6.0/debian/patches/series mesa-7.6.0/debian/patches/series
--- mesa-7.6.0/debian/patches/series
+++ mesa-7.6.0/debian/patches/series
@@ -11,0 +12 @@
+111_b43_id_update.patch
only in patch2:
unchanged:
--- mesa-7.6.0.orig/debian/patches/111_b43_id_update.patch
+++ mesa-7.6.0/debian/patches/111_b43_id_update.patch
@@ -0,0 +1,34 @@
+diff --git a/src/mesa/drivers/dri/intel/intel_chipset.h b/src/mesa/drivers/dri/intel/intel_chipset.h
+index 1e7ceed..4fecdbe 100644
+--- a/src/mesa/drivers/dri/intel/intel_chipset.h
++++ b/src/mesa/drivers/dri/intel/intel_chipset.h
+@@ -67,6 +67,7 @@
+ #define PCI_CHIP_G45_G                  0x2E22
+ #define PCI_CHIP_G41_G                  0x2E32
+ #define PCI_CHIP_B43_G                  0x2E42
++#define PCI_CHIP_B43_G1                 0x2E92
+ 
+ #define PCI_CHIP_ILD_G                  0x0042
+ #define PCI_CHIP_ILM_G                  0x0046
+@@ -93,7 +94,8 @@
+                                  devid == PCI_CHIP_Q45_G || \
+                                  devid == PCI_CHIP_G45_G || \
+                                  devid == PCI_CHIP_G41_G || \
+-                                 devid == PCI_CHIP_B43_G)
++                                 devid == PCI_CHIP_B43_G || \
++                                 devid == PCI_CHIP_B43_G1)
+ #define IS_GM45(devid)          (devid == PCI_CHIP_GM45_GM)
+ #define IS_G4X(devid)		(IS_G45(devid) || IS_GM45(devid))
+ 
+diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
+index 7ace50b..3b1b887 100644
+--- a/src/mesa/drivers/dri/intel/intel_context.c
++++ b/src/mesa/drivers/dri/intel/intel_context.c
+@@ -155,6 +155,7 @@ intelGetString(struct gl_context * ctx, GLenum name)
+          chipset = "Intel(R) G41";
+          break;
+       case PCI_CHIP_B43_G:
++      case PCI_CHIP_B43_G1:
+          chipset = "Intel(R) B43";
+          break;
+       case PCI_CHIP_ILD_G: