Merge branch 'ull' into test

Conflicts:
	drivers/acpi/bay.c
	drivers/acpi/dock.c
	drivers/ata/libata-acpi.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index 2377e8b917d7..1e74988c7b2d 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -753,7 +753,7 @@ static int get_lcd_state(void)
                         /* That's what the AML code does */
                         lcd = out_obj.integer.value >> 8;
         } else if (hotk->model == F3Sa) {
-                unsigned long tmp;
+                unsigned long long tmp;
                 union acpi_object param;
                 struct acpi_object_list input;
                 acpi_status status;