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, 2 insertions, 2 deletions

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index b11400e2f856..c797c6473f31 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -94,7 +94,7 @@ EXPORT_SYMBOL(acpi_bus_get_device);
 int acpi_bus_get_status(struct acpi_device *device)
 {
         acpi_status status = AE_OK;
-        unsigned long sta = 0;
+        unsigned long long sta = 0;
 
 
         if (!device)
@@ -172,7 +172,7 @@ int acpi_bus_get_power(acpi_handle handle, int *state)
         int result = 0;
         acpi_status status = 0;
         struct acpi_device *device = NULL;
-        unsigned long psc = 0;
+        unsigned long long psc = 0;
 
 
         result = acpi_bus_get_device(handle, &device);