Merge branch 'ull' into test
authorLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:33:29 +0000 (23:33 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:33:29 +0000 (23:33 -0400)
commit7674416db4ee3d43813dddb650364ca994755256
tree1a4549823d7bdd892dc3b3b7b3fa9214216ac384
parent0ca9413c234aa5a49ffaf80e46b50721a752e45a
parent27663c5855b10af9ec67bc7dfba001426ba21222
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>
24 files changed:
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