[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3

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

diff --cc arch/i386/kernel/acpi/boot.c
Simple merge

diff --cc arch/ia64/kernel/acpi.c
Simple merge

diff --cc arch/ia64/kernel/iosapic.c
Simple merge

diff --cc drivers/acpi/Kconfig
Simple merge

diff --cc drivers/acpi/pci_irq.c
Simple merge

diff --cc drivers/acpi/pci_link.c
index 834c2ce,a0df2f3..26aa382
--- 1/drivers/acpi/pci_link.c
--- 2/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@@ -786,26 -786,7 +786,25 @@@ end
        return_VALUE(result);
  }
  
 -static int irqrouter_suspend(struct sys_device *dev, pm_message_t state)
 +static int
 +acpi_pci_link_resume(
 +      struct acpi_pci_link *link)
 +{
 +      ACPI_FUNCTION_TRACE("acpi_pci_link_resume");
 +
 +      if (link->refcnt && link->irq.active && link->irq.initialized)
 +              return_VALUE(acpi_pci_link_set(link, link->irq.active));
 +      else
 +              return_VALUE(0);
 +}
 +
 +/*
 + * FIXME: this is a workaround to avoid nasty warning.  It will be removed
 + * after every device calls pci_disable_device in .resume.
 + */
 +int acpi_in_resume;
 +static int
- irqrouter_resume(
-       struct sys_device *dev)
++irqrouter_resume(struct sys_device *dev)
  {
        struct list_head        *node = NULL;
        struct acpi_pci_link    *link = NULL;

diff --cc drivers/char/hpet.c
Simple merge

diff --cc include/linux/acpi.h
Simple merge