Merge branch 'ull' into test
Len Brown [Thu, 23 Oct 2008 03:33:29 +0000 (23:33 -0400)]
Conflicts:
drivers/acpi/bay.c
drivers/acpi/dock.c
drivers/ata/libata-acpi.c

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

24 files changed:
1  2 
drivers/acpi/ac.c
drivers/acpi/acpi_memhotplug.c
drivers/acpi/asus_acpi.c
drivers/acpi/bus.c
drivers/acpi/button.c
drivers/acpi/container.c
drivers/acpi/dock.c
drivers/acpi/ec.c
drivers/acpi/osl.c
drivers/acpi/pci_root.c
drivers/acpi/power.c
drivers/acpi/processor_core.c
drivers/acpi/processor_perflib.c
drivers/acpi/processor_throttling.c
drivers/acpi/sbshc.c
drivers/acpi/sleep/main.c
drivers/acpi/thermal.c
drivers/acpi/video.c
drivers/misc/asus-laptop.c
drivers/misc/eeepc-laptop.c
drivers/misc/fujitsu-laptop.c
drivers/misc/intel_menlow.c
drivers/pci/hotplug/acpiphp_glue.c
include/acpi/acpi_bus.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -900,9 -727,7 +900,9 @@@ static DEVICE_ATTR(undock, S_IWUSR, NUL
  static ssize_t show_dock_uid(struct device *dev,
                             struct device_attribute *attr, char *buf)
  {
-       unsigned long lbuf;
+       unsigned long long lbuf;
 +      struct dock_station *dock_station = *((struct dock_station **)
 +              dev->platform_data);
        acpi_status status = acpi_evaluate_integer(dock_station->handle,
                                        "_UID", NULL, &lbuf);
        if (ACPI_FAILURE(status))
Simple merge
Simple merge
Simple merge
@@@ -136,16 -128,16 +136,16 @@@ acpi_power_get_context(acpi_handle hand
        return 0;
  }
  
 -static int acpi_power_get_state(struct acpi_power_resource *resource, int *state)
 +static int acpi_power_get_state(acpi_handle handle, int *state)
  {
        acpi_status status = AE_OK;
-       unsigned long sta = 0;
+       unsigned long long sta = 0;
  
  
 -      if (!resource || !state)
 +      if (!handle || !state)
                return -EINVAL;
  
 -      status = acpi_evaluate_integer(resource->device->handle, "_STA", NULL, &sta);
 +      status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
        if (ACPI_FAILURE(status))
                return -ENODEV;
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge