Merge tag 'v2.6.35-rc6' into drm-radeon-next

Need this to avoid conflicts with future radeon fixes

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/hwmon/k8temp.c b/drivers/hwmon/k8temp.c
index f26acdb11681..8bdf80d91598 100644
--- a/drivers/hwmon/k8temp.c
+++ b/drivers/hwmon/k8temp.c
@@ -180,11 +180,13 @@ static int __devinit k8temp_probe(struct pci_dev *pdev,
                 }
 
                 if ((model >= 0x69) &&
-                    !(model == 0xc1 || model == 0x6c || model == 0x7c)) {
+                    !(model == 0xc1 || model == 0x6c || model == 0x7c ||
+                      model == 0x6b || model == 0x6f || model == 0x7f)) {
                         /*
-                         * RevG desktop CPUs (i.e. no socket S1G1 parts)
-                         * need additional offset, otherwise reported
-                         * temperature is below ambient temperature
+                         * RevG desktop CPUs (i.e. no socket S1G1 or
+                         * ASB1 parts) need additional offset,
+                         * otherwise reported temperature is below
+                         * ambient temperature
                          */
                         data->temp_offset = 21000;
                 }