Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

Pull fixes in from 2.6.31 so that people testing the iommu-2.6.git tree
no longer trip over bugs which were already fixed (sorry, Horms).

1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
index bff0103610c1..fe4fa29c9219 100644
--- a/drivers/hwmon/asus_atk0110.c
+++ b/drivers/hwmon/asus_atk0110.c
@@ -593,7 +593,11 @@ static int atk_add_sensor(struct atk_data *data, union acpi_object *obj)
         sensor->data = data;
         sensor->id = flags->integer.value;
         sensor->limit1 = limit1->integer.value;
-        sensor->limit2 = limit2->integer.value;
+        if (data->old_interface)
+                sensor->limit2 = limit2->integer.value;
+        else
+                /* The upper limit is expressed as delta from lower limit */
+                sensor->limit2 = sensor->limit1 + limit2->integer.value;
 
         snprintf(sensor->input_attr_name, ATTR_NAME_SIZE,
                         "%s%d_input", base_name, start + *num);