/home/lenb/src/to-linus branch 'acpi-2.6.12'

diff --cc arch/i386/pci/common.c
Simple merge

diff --cc arch/i386/pci/irq.c
index 766b104,66e4149..187350c
--- 1/arch/i386/pci/irq.c
--- 2/arch/i386/pci/irq.c
+++ b/arch/i386/pci/irq.c
@@@ -56,36 -56,8 +56,37 @@@ struct irq_router_handler 
  };
  
  int (*pcibios_enable_irq)(struct pci_dev *dev) = NULL;
+ void (*pcibios_disable_irq)(struct pci_dev *dev) = NULL;
  
 +/*
 + *  Check passed address for the PCI IRQ Routing Table signature
 + *  and perform checksum verification.
 + */
 +
 +static inline struct irq_routing_table * pirq_check_routing_table(u8 *addr)
 +{
 +      struct irq_routing_table *rt;
 +      int i;
 +      u8 sum;
 +
 +      rt = (struct irq_routing_table *) addr;
 +      if (rt->signature != PIRQ_SIGNATURE ||
 +          rt->version != PIRQ_VERSION ||
 +          rt->size % 16 ||
 +          rt->size < sizeof(struct irq_routing_table))
 +              return NULL;
 +      sum = 0;
 +      for (i=0; i < rt->size; i++)
 +              sum += addr[i];
 +      if (!sum) {
 +              DBG("PCI: Interrupt Routing Table found at 0x%p\n", rt);
 +              return rt;
 +      }
 +      return NULL;
 +}
 +
 +
 +
  /*
   *  Search 0xf0000 -- 0xfffff for the PCI IRQ Routing Table.
   */

diff --cc arch/i386/pci/pci.h
Simple merge

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

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

diff --cc drivers/net/sk98lin/skge.c
Simple merge

diff --cc drivers/pcmcia/yenta_socket.c
Simple merge

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

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

diff --cc sound/pci/intel8x0.c
Simple merge