Merge commit 'v2.6.35.14' into zygo-2.6.35.14-zb5s

Conflicts:
	drivers/bluetooth/btusb.c
	drivers/video/backlight/mbp_nvidia_bl.c

diff --cc Makefile
index 44a3b04125d84e629afee552313c7e4a5456bdc2,45759718a179bc1fe72169547dc6e2edb9fdf9a5..d74a9341aa495698dbf5b10d2d5ddb4840a12a69
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 35
- EXTRAVERSION = .9
+ EXTRAVERSION = .14
  NAME = Yokohama
  
 +EXTRAVERSION := $(EXTRAVERSION)-zb5s
 +
  # *DOCUMENTATION*
  # To see a list of typical targets execute "make help"
  # More info can be located in ./README

diff --cc drivers/video/backlight/mbp_nvidia_bl.c
index a12db50048f0349e0dd2cd69bc39cf4f1cae9802,1485f7345f49ee32586d5d665d1bd624cfcd3e1a..b930bd3e070efffa7a9a2bf972e8e754bf1d2999
--- 1/drivers/video/backlight/mbp_nvidia_bl.c
--- 2/drivers/video/backlight/mbp_nvidia_bl.c
+++ b/drivers/video/backlight/mbp_nvidia_bl.c
@@@ -335,15 -335,24 +335,33 @@@ static const struct dmi_system_id __ini
                },
                .driver_data    = (void *)&nvidia_chipset_data,
        },
 +      {
 +              .callback       = mbp_dmi_match,
 +              .ident          = "MacBookPro 6,2",
 +              .matches        = {
 +                      DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
 +                      DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro6,2"),
 +              },
 +              .driver_data    = (void *)&intel_chipset_data,
 +      },
+       {
+               .callback       = mbp_dmi_match,
+               .ident          = "MacBookAir 3,1",
+               .matches        = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir3,1"),
+               },
+               .driver_data    = (void *)&nvidia_chipset_data,
+       },
+       {
+               .callback       = mbp_dmi_match,
+               .ident          = "MacBookAir 3,2",
+               .matches        = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir3,2"),
+               },
+               .driver_data    = (void *)&nvidia_chipset_data,
+       },
        { }
  };